【NEW】增加安全工具检验记录，意见反馈功能

railway-admin/src/main/java/com/railway/web/controller/business/app/AppFeedbackController.java

@@ -0,0 +1,72 @@
+package com.railway.web.controller.business.app;
+
+import com.railway.business.app.domain.AppFeedback;
+import com.railway.business.app.service.IAppFeedbackService;
+import com.railway.common.core.controller.BaseController;
+import com.railway.common.core.domain.AjaxResult;
+import com.railway.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import javax.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author ZhaoMn
+ */
+@Api(value = "rest/app", tags = "意见反馈 - apk意见反馈")
+@RestController
+@Validated
+@RequestMapping(value = "app/feedback")
+public class AppFeedbackController extends BaseController {
+
+  private final IAppFeedbackService appFeedbackService;
+
+  public AppFeedbackController(IAppFeedbackService appFeedbackService) {
+    this.appFeedbackService = appFeedbackService;
+  }
+
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody AppFeedback appFeedback) {
+    return toAjax(appFeedbackService.create(appFeedback));
+  }
+
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{ids}")
+  public AjaxResult delete(@RequestParam String[] ids) {
+    return toAjax(appFeedbackService.delete(ids));
+  }
+
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid AppFeedback appFeedback) {
+    return toAjax(appFeedbackService.update(appFeedback));
+  }
+
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{id}"})
+  public AjaxResult getInfo(String id) {
+    AppFeedback info = appFeedbackService.getInfo(id);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
+
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(AppFeedback appFeedback) {
+    startPage();
+    List<AppFeedback> list = appFeedbackService.getList(appFeedback);
+    return getDataTable(list);
+  }
+
+}

railway-admin/src/main/java/com/railway/web/controller/business/push/BusPushMsgController.java

@@ -7,7 +7,6 @@ import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -19,8 +18,12 @@ import java.util.List;
 @Validated
 @RequestMapping(value = "business/push/bus/push/msg")
 public class BusPushMsgController extends BaseController {
-    @Autowired
-    private IBusPushMsgService busPushMsgService;
+
+    private final IBusPushMsgService busPushMsgService;
+
+    public BusPushMsgController(IBusPushMsgService busPushMsgService) {
+        this.busPushMsgService = busPushMsgService;
+    }
 
     @ApiOperation(value = "新增")
     @PostMapping("/add")

railway-admin/src/main/java/com/railway/web/controller/business/safetool/BaseSafetyToolController.java

@@ -9,7 +9,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import java.util.List;
 import javax.validation.Valid;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,13 +19,20 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+/**
+ * @author wuhonghao
+ */
 @Api(value = "rest/safetool/base/safety/tool", tags = "安全工具 - 基础数据")
 @RestController
 @Validated
 @RequestMapping(value = "business/safetool/base/safety/tool")
 public class BaseSafetyToolController extends BaseController {
-    @Autowired
-    private IBaseSafetyToolService baseSafetyToolService;
+
+    private final IBaseSafetyToolService baseSafetyToolService;
+
+    public BaseSafetyToolController(IBaseSafetyToolService baseSafetyToolService) {
+        this.baseSafetyToolService = baseSafetyToolService;
+    }
 
     @ApiOperation(value = "新增")
     @PostMapping("/add")

railway-admin/src/main/java/com/railway/web/controller/business/safetool/SecScheduledController.java

@@ -6,26 +6,28 @@ import com.railway.business.safetool.domain.vo.*;
 import com.railway.business.safetool.service.ISecScheduledService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.WebDataBinder;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
 import javax.validation.Valid;
 import java.util.List;
 
-import javax.validation.Valid;
-
+/**
+ * @author lijie
+ */
 @Api(value = "rest/safetool/sec/scheduled", tags = "安全工具 - 计划")
 @RestController
 @Validated
 @RequestMapping(value = "business/safetool/sec/scheduled")
 public class SecScheduledController extends BaseController {
-    @Autowired
-    private ISecScheduledService secScheduledService;
+
+    private final ISecScheduledService secScheduledService;
+
+    public SecScheduledController(ISecScheduledService secScheduledService) {
+        this.secScheduledService = secScheduledService;
+    }
 
     @ApiOperation(value = "新增")
     @PostMapping("/add")

railway-admin/src/main/java/com/railway/web/controller/business/safetool/SecScheduledToolController.java

@@ -9,7 +9,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import java.util.List;
 import javax.validation.Valid;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,13 +19,20 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+/**
+ * @author lijie
+ */
 @Api(value = "rest/safetool/sec/scheduled/tool", tags = "安全计划和工具关系表")
 @RestController
 @Validated
 @RequestMapping(value = "business/safetool/sec/scheduled/tool")
 public class SecScheduledToolController extends BaseController {
-    @Autowired
-    private ISecScheduledToolService secScheduledToolService;
+
+    private final ISecScheduledToolService secScheduledToolService;
+
+    public SecScheduledToolController(ISecScheduledToolService secScheduledToolService) {
+        this.secScheduledToolService = secScheduledToolService;
+    }
 
     @ApiOperation(value = "新增")
     @PostMapping("/add")

railway-admin/src/main/java/com/railway/web/controller/business/safetool/SecTestRecordController.java

@@ -0,0 +1,65 @@
+package com.railway.web.controller.business.safetool;
+
+import com.railway.business.safetool.domain.SecTestRecord;
+import com.railway.business.safetool.service.ISecTestRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import com.railway.common.core.controller.BaseController;
+import com.railway.common.core.domain.AjaxResult;
+import com.railway.common.core.page.TableDataInfo;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @author ZhaoMn
+ */
+@Api(value = "rest/business/safetool/test/record", tags = "安全工具 - 检验记录")
+@RestController
+@Validated
+@RequestMapping(value = "business/safetool/test/record")
+public class SecTestRecordController extends BaseController {
+
+  private final ISecTestRecordService secTestRecordService;
+
+  public SecTestRecordController(ISecTestRecordService secTestRecordService) {
+    this.secTestRecordService = secTestRecordService;
+  }
+
+  @ApiOperation(value = "新增")
+  @PostMapping("/add")
+  public AjaxResult add(@Validated @RequestBody SecTestRecord secTestRecord) {
+    return toAjax(secTestRecordService.create(secTestRecord));
+  }
+
+  @ApiOperation(value = "删除")
+  @DeleteMapping("/{ids}")
+  public AjaxResult delete(@RequestParam String[] ids) {
+    return toAjax(secTestRecordService.delete(ids));
+  }
+
+  @ApiOperation(value = "更新")
+  @PutMapping("/update")
+  public AjaxResult update(@RequestBody @Valid SecTestRecord secTestRecord) {
+    return toAjax(secTestRecordService.update(secTestRecord));
+  }
+
+  @ApiOperation(value = "单个")
+  @GetMapping(value = {"/", "/{id}"})
+  public AjaxResult getInfo(String id) {
+    SecTestRecord info = secTestRecordService.getInfo(id);
+    AjaxResult ajax = AjaxResult.success();
+    ajax.put("info", info);
+    return ajax;
+  }
+
+  @ApiOperation(value = "列表")
+  @GetMapping(value = "list")
+  public TableDataInfo getList(SecTestRecord secTestRecord) {
+    startPage();
+    List<SecTestRecord> list = secTestRecordService.getList(secTestRecord);
+    return getDataTable(list);
+  }
+
+}

railway-admin/src/main/java/com/railway/web/controller/common/CaptchaController.java

@@ -44,8 +44,7 @@ public class CaptchaController extends BaseController {
   private final RedisCache redisCache;
   private final ISysConfigService configService;
 
-  public CaptchaController(RedisCache redisCache,
-      ISysConfigService configService) {
+  public CaptchaController(RedisCache redisCache, ISysConfigService configService) {
     this.redisCache = redisCache;
     this.configService = configService;
   }
@@ -73,14 +72,14 @@ public class CaptchaController extends BaseController {
     if(null == type){
       type = this.captchaType;
     }
-
+    String math = "math", string = "char";
     // 生成验证码
-    if ("math".equals(type)) {
+    if (math.equals(type)) {
       String capText = captchaProducerMath.createText();
       capStr = capText.substring(0, capText.lastIndexOf("@"));
       code = capText.substring(capText.lastIndexOf("@") + 1);
       image = captchaProducerMath.createImage(capStr);
-    } else if ("char".equals(captchaType)) {
+    } else if (string.equals(captchaType)) {
       capStr = code = captchaProducer.createText();
       image = captchaProducer.createImage(capStr);
     }

railway-business/src/main/java/com/railway/business/app/domain/AppFeedback.java

@@ -0,0 +1,31 @@
+package com.railway.business.app.domain;
+
+import com.railway.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+/**
+ * @author ZhaoMn
+ */
+@Data
+@ApiModel("apk问题反馈")
+@EqualsAndHashCode(callSuper = true)
+public class AppFeedback extends BaseEntity {
+
+  @ApiModelProperty(value = "主键", hidden = true)
+  private Long id;
+
+  @ApiModelProperty(value = "用户id")
+  private Long userId;
+
+  @ApiModelProperty(value = "意见建议")
+  private String content;
+
+  @ApiModelProperty(value = "del_flag")
+  @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
+  private String delFlag;
+
+}

railway-business/src/main/java/com/railway/business/app/mapper/AppFeedbackMapper.java

@@ -0,0 +1,42 @@
+package com.railway.business.app.mapper;
+
+import com.github.pagehelper.Page;
+import com.railway.business.app.domain.AppFeedback;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author ZhaoMn
+ * @date 2021/12/25
+ */
+@Mapper
+@Repository
+public interface AppFeedbackMapper {
+
+  /**
+   * 新增
+   */
+  int insert(AppFeedback appFeedback);
+
+  /**
+   * 删除
+   */
+  int delete(@Param("id") String id);
+
+  /**
+   * 更新
+   */
+  int update(AppFeedback appFeedback);
+
+  /**
+   * 获取单个
+   */
+  AppFeedback getInfo(@Param("id") String id);
+
+  /**
+   * 查询列表
+   */
+  Page<AppFeedback> getList(AppFeedback appFeedback);
+
+}

railway-business/src/main/java/com/railway/business/app/service/IAppFeedbackService.java

@@ -0,0 +1,37 @@
+package com.railway.business.app.service;
+
+import com.railway.business.app.domain.AppFeedback;
+import java.util.List;
+
+/**
+ * @author ZhaoMn
+ * @date 2021/12/25
+ */
+public interface IAppFeedbackService {
+
+  /**
+   * 新增
+   */
+  int create(AppFeedback appFeedback);
+
+  /**
+   * 删除
+   */
+  int delete(String[] ids);
+
+  /**
+   * 更新
+   */
+  int update(AppFeedback appFeedback);
+
+  /**
+   * 获取单个
+   */
+  AppFeedback getInfo(String id);
+
+  /**
+   * 查询列表
+   */
+  List<AppFeedback> getList(AppFeedback appFeedback);
+
+}

railway-business/src/main/java/com/railway/business/app/service/impl/AppFeedbackServiceImpl.java

@@ -0,0 +1,76 @@
+package com.railway.business.app.service.impl;
+
+import com.railway.business.app.domain.AppFeedback;
+import com.railway.business.app.mapper.AppFeedbackMapper;
+import com.railway.business.app.service.IAppFeedbackService;
+import org.springframework.stereotype.Service;
+import com.railway.common.utils.SecurityUtils;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Date;
+
+/**
+ * @author ZhaoMn
+ * @date 2021/12/25
+ */
+@Service
+public class AppFeedbackServiceImpl implements IAppFeedbackService {
+
+  private final AppFeedbackMapper appFeedbackMapper;
+
+  public AppFeedbackServiceImpl(AppFeedbackMapper appFeedbackMapper) {
+    this.appFeedbackMapper = appFeedbackMapper;
+  }
+
+  /**
+   * 新增
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int create(AppFeedback appFeedback) {
+    appFeedback.setCreateTime(new Date());
+    appFeedback.setCreateBy(SecurityUtils.getUsername());
+    return appFeedbackMapper.insert(appFeedback);
+  }
+
+  /**
+   * 删除
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int delete(String[] ids) {
+    int r = 0;
+    for (String id : ids) {
+      int j = appFeedbackMapper.delete(id);
+      r = r + j;
+    }
+    return r;
+  }
+
+  /**
+   * 更新
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int update(AppFeedback appFeedback) {
+    appFeedback.setUpdateTime(new Date());
+    appFeedback.setUpdateBy(SecurityUtils.getUsername());
+    return appFeedbackMapper.update(appFeedback);
+  }
+
+  /**
+   * 获取单个
+   */
+  @Override
+  public AppFeedback getInfo(String id) {
+    return appFeedbackMapper.getInfo(id);
+  }
+
+  /**
+   * 查询列表
+   */
+  @Override
+  public List<AppFeedback> getList(AppFeedback appFeedback) {
+    return appFeedbackMapper.getList(appFeedback);
+  }
+}

railway-business/src/main/java/com/railway/business/push/service/impl/BusPushMsgServiceImpl.java

@@ -17,14 +17,12 @@ import com.railway.business.push.mapper.BusPushMsgMapper;
 import com.railway.business.push.service.IBusPushMsgService;
 import com.railway.common.utils.SecurityUtils;
 import com.railway.system.service.ISysConfigService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import java.io.IOException;
 import java.util.Date;
 import java.util.List;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 /**
 * 个推消息表
 * @author author
@@ -69,6 +67,7 @@ public class BusPushMsgServiceImpl implements IBusPushMsgService{
 	/**
 	* 新增
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int create(BusPushMsg busPushMsg) {
 	    busPushMsg.setCreateTime(new Date());
@@ -81,6 +80,7 @@ public class BusPushMsgServiceImpl implements IBusPushMsgService{
 	/**
 	* 删除
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int delete(String[] ids) {
 		int r =0;
@@ -94,6 +94,7 @@ public class BusPushMsgServiceImpl implements IBusPushMsgService{
 	/**
 	* 更新
 	*/
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public int update(BusPushMsg busPushMsg) {
 		busPushMsg.setUpdateTime(new Date());
@@ -104,6 +105,7 @@ public class BusPushMsgServiceImpl implements IBusPushMsgService{
 	/**
 	* 获取单个
 	*/
+	@Override
 	public BusPushMsg getInfo(String id) {
 		return busPushMsgMapper.getInfo(id);
 	}
@@ -111,6 +113,7 @@ public class BusPushMsgServiceImpl implements IBusPushMsgService{
 	/**
 	* 查询列表
 	*/
+	@Override
 	public List<BusPushMsg> getList(BusPushMsg busPushMsg) {
 		return busPushMsgMapper.getList(busPushMsg);
 	}

railway-business/src/main/java/com/railway/business/safetool/domain/SecTestRecord.java

@@ -0,0 +1,52 @@
+package com.railway.business.safetool.domain;
+
+import com.railway.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+/**
+ * @author ZhaoMn
+ */
+@Data
+@ApiModel("安全工具-检验记录")
+@EqualsAndHashCode(callSuper = true)
+public class SecTestRecord extends BaseEntity {
+
+  @ApiModelProperty(value = "主键", hidden = true)
+  private Long id;
+
+  @ApiModelProperty(value = "车间id")
+  private Long deptId;
+
+  @ApiModelProperty(value = "存放处所 暂不用")
+  @Length(max = 100, message = "【存放处所 暂不用】长度必须介于 {min} 和 {max} 之间")
+  private String storePlace;
+
+  @ApiModelProperty(value = "实验室id 部门表类型为实验室")
+  private Long labId;
+
+  @ApiModelProperty(value = "实验截止日期")
+  private Date closingTime;
+
+  @ApiModelProperty(value = "送检人")
+  private Long applyUser;
+
+  @ApiModelProperty(value = "实验日期")
+  private Date testTime;
+
+  @ApiModelProperty(value = "实验人")
+  private Long testUser;
+
+  @ApiModelProperty(value = "状态，0待实验，1已实验")
+  @Length(min = 1, max = 1, message = "【状态，0待实验，1已实验】长度必须介于 {min} 和 {max} 之间")
+  private String state;
+
+  @ApiModelProperty(value = "del_flag")
+  @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
+  private String delFlag;
+
+}

railway-business/src/main/java/com/railway/business/safetool/mapper/SecTestRecordMapper.java

@@ -0,0 +1,42 @@
+package com.railway.business.safetool.mapper;
+
+import com.github.pagehelper.Page;
+import com.railway.business.safetool.domain.SecTestRecord;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author ZhaoMn
+ * @date 2021/12/25
+ */
+@Mapper
+@Repository
+public interface SecTestRecordMapper {
+
+  /**
+   * 新增
+   */
+  int insert(SecTestRecord secTestRecord);
+
+  /**
+   * 删除
+   */
+  int delete(@Param("id") String id);
+
+  /**
+   * 更新
+   */
+  int update(SecTestRecord secTestRecord);
+
+  /**
+   * 获取单个
+   */
+  SecTestRecord getInfo(@Param("id") String id);
+
+  /**
+   * 查询列表
+   */
+  Page<SecTestRecord> getList(SecTestRecord secTestRecord);
+
+}

railway-business/src/main/java/com/railway/business/safetool/service/ISecTestRecordService.java

@@ -0,0 +1,37 @@
+package com.railway.business.safetool.service;
+
+import com.railway.business.safetool.domain.SecTestRecord;
+import java.util.List;
+
+/**
+ * @author ZhaoMn
+ * @date 2021/12/25
+ */
+public interface ISecTestRecordService {
+
+  /**
+   * 新增
+   */
+  int create(SecTestRecord secTestRecord);
+
+  /**
+   * 删除
+   */
+  int delete(String[] ids);
+
+  /**
+   * 更新
+   */
+  int update(SecTestRecord secTestRecord);
+
+  /**
+   * 获取单个
+   */
+  SecTestRecord getInfo(String id);
+
+  /**
+   * 查询列表
+   */
+  List<SecTestRecord> getList(SecTestRecord secTestRecord);
+
+}

railway-business/src/main/java/com/railway/business/safetool/service/impl/BaseSafetyToolServiceImpl.java

@@ -1,97 +1,104 @@
 package com.railway.business.safetool.service.impl;
 
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.railway.business.safetool.mapper.BaseSafetyToolMapper;
 import com.railway.business.safetool.domain.BaseSafetyTool;
+import com.railway.business.safetool.mapper.BaseSafetyToolMapper;
 import com.railway.business.safetool.service.IBaseSafetyToolService;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.railway.common.utils.SecurityUtils;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
 import java.util.Date;
+import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 /**
-* 安全工具-基础数据
-* @author wuhonghao
-* @date 2021/12/01
-*/
+ * 安全工具-基础数据
+ *
+ * @author wuhonghao
+ * @date 2021/12/01
+ */
 @Service
 @Transactional(readOnly = true)
-public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService{
-@Autowired
-private BaseSafetyToolMapper baseSafetyToolMapper;
+public class BaseSafetyToolServiceImpl implements IBaseSafetyToolService {
+
+  private final BaseSafetyToolMapper baseSafetyToolMapper;
+
+  public BaseSafetyToolServiceImpl(BaseSafetyToolMapper baseSafetyToolMapper) {
+    this.baseSafetyToolMapper = baseSafetyToolMapper;
+  }
 
-	/**
-	* 新增
-	*/
-	@Transactional(rollbackFor = Exception.class)
-	public int create(BaseSafetyTool baseSafetyTool) {
-	    baseSafetyTool.setCreateTime(new Date());
-        baseSafetyTool.setCreateBy(SecurityUtils.getUsername());
-		baseSafetyTool.setState("1");
-		return baseSafetyToolMapper.insert(baseSafetyTool);
-	}
+  /**
+   * 新增
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int create(BaseSafetyTool baseSafetyTool) {
+    baseSafetyTool.setCreateTime(new Date());
+    baseSafetyTool.setCreateBy(SecurityUtils.getUsername());
+    baseSafetyTool.setState("1");
+    return baseSafetyToolMapper.insert(baseSafetyTool);
+  }
 
-	/**
-	* 删除
-	*/
-	@Transactional(rollbackFor = Exception.class)
-	public int delete(String[] toolIds) {
-		int r =0;
-		for (String toolId : toolIds) {
-			int j= baseSafetyToolMapper.delete(toolId);
-			r = r + j;
-		}
-		return	r;
-	}
+  /**
+   * 删除
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int delete(String[] toolIds) {
+    int r = 0;
+    for (String toolId : toolIds) {
+      int j = baseSafetyToolMapper.delete(toolId);
+      r = r + j;
+    }
+    return r;
+  }
 
-	/**
-	* 更新
-	*/
-	@Transactional(rollbackFor = Exception.class)
-	public int update(BaseSafetyTool baseSafetyTool) {
-		baseSafetyTool.setUpdateTime(new Date());
-    	baseSafetyTool.setUpdateBy(SecurityUtils.getUsername());
-		return baseSafetyToolMapper.update(baseSafetyTool);
-	}
+  /**
+   * 更新
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int update(BaseSafetyTool baseSafetyTool) {
+    baseSafetyTool.setUpdateTime(new Date());
+    baseSafetyTool.setUpdateBy(SecurityUtils.getUsername());
+    return baseSafetyToolMapper.update(baseSafetyTool);
+  }
 
-	/**
-	* 获取单个
-	*/
-	public BaseSafetyTool getInfo(String toolId) {
-		return baseSafetyToolMapper.getInfo(toolId);
-	}
+  /**
+   * 获取单个
+   */
+  @Override
+  public BaseSafetyTool getInfo(String toolId) {
+    return baseSafetyToolMapper.getInfo(toolId);
+  }
 
-	/**
-	* 查询列表
-	*/
-	public List<BaseSafetyTool> getList(BaseSafetyTool baseSafetyTool) {
-		return baseSafetyToolMapper.getList(baseSafetyTool);
-	}
+  /**
+   * 查询列表
+   */
+  @Override
+  public List<BaseSafetyTool> getList(BaseSafetyTool baseSafetyTool) {
+    return baseSafetyToolMapper.getList(baseSafetyTool);
+  }
 
-	/**
-	 * 替换安全工具
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int replaceTool(BaseSafetyTool baseSafetyTool) {
-		Long toolId = baseSafetyTool.getToolId();
-		//插入新的安全工具
-		baseSafetyTool.setCreateTime(new Date());
-		baseSafetyTool.setCreateBy(SecurityUtils.getUsername());
-		baseSafetyTool.setState("1");
-		baseSafetyToolMapper.insert(baseSafetyTool);
+  /**
+   * 替换安全工具
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int replaceTool(BaseSafetyTool baseSafetyTool) {
+    Long toolId = baseSafetyTool.getToolId();
+    //插入新的安全工具
+    baseSafetyTool.setCreateTime(new Date());
+    baseSafetyTool.setCreateBy(SecurityUtils.getUsername());
+    baseSafetyTool.setState("1");
+    baseSafetyToolMapper.insert(baseSafetyTool);
 
-		//将原安全工具状态设置为报废并记录替换ID
-		BaseSafetyTool temp = new BaseSafetyTool();
-		temp.setToolId(toolId);
-		temp.setScrapDate(new Date());
-		temp.setState("0");
-		temp.setScrapUser(SecurityUtils.getUsername());
-		temp.setReplaceToolId(baseSafetyTool.getToolId());
+    //将原安全工具状态设置为报废并记录替换ID
+    BaseSafetyTool temp = new BaseSafetyTool();
+    temp.setToolId(toolId);
+    temp.setScrapDate(new Date());
+    temp.setState("0");
+    temp.setScrapUser(SecurityUtils.getUsername());
+    temp.setReplaceToolId(baseSafetyTool.getToolId());
 
-		return baseSafetyToolMapper.update(temp);
-	}
+    return baseSafetyToolMapper.update(temp);
+  }
 }

railway-business/src/main/java/com/railway/business/safetool/service/impl/SecScheduledServiceImpl.java

@@ -1,26 +1,18 @@
 package com.railway.business.safetool.service.impl;
 
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.railway.business.safetool.domain.BaseSafetyTool;
 import com.railway.business.safetool.domain.SecScheduledTool;
 import com.railway.business.safetool.domain.vo.*;
 import com.railway.business.safetool.mapper.SecScheduledMapper;
 import com.railway.business.safetool.domain.SecScheduled;
 import com.railway.business.safetool.mapper.SecScheduledToolMapper;
 import com.railway.business.safetool.service.ISecScheduledService;
-import com.railway.common.core.page.TableDataInfo;
 import com.railway.common.utils.bean.BeanUtils;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.railway.common.utils.SecurityUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.GetMapping;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Date;
 /**
@@ -31,10 +23,16 @@ import java.util.Date;
 @Service
 @Transactional(readOnly = true)
 public class SecScheduledServiceImpl implements ISecScheduledService{
-@Autowired
-private SecScheduledMapper secScheduledMapper;
-	@Autowired
-	private SecScheduledToolMapper secScheduledToolMapper;
+
+	private final SecScheduledMapper secScheduledMapper;
+	private final SecScheduledToolMapper secScheduledToolMapper;
+
+	public SecScheduledServiceImpl(SecScheduledMapper secScheduledMapper,
+			SecScheduledToolMapper secScheduledToolMapper) {
+		this.secScheduledMapper = secScheduledMapper;
+		this.secScheduledToolMapper = secScheduledToolMapper;
+	}
+
 	/**
 	* 新增
 	*/
@@ -123,7 +121,7 @@ private SecScheduledMapper secScheduledMapper;
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public int delTools(SecScheduledToolsAddVo secScheduled) throws Exception {
+	public int delTools(SecScheduledToolsAddVo secScheduled) {
 
 		if (secScheduledToolMapper.checkdel(secScheduled)!=1){
 			return secScheduledToolMapper.delete(secScheduled);

railway-business/src/main/java/com/railway/business/safetool/service/impl/SecScheduledToolServiceImpl.java

@@ -1,16 +1,13 @@
 package com.railway.business.safetool.service.impl;
 
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.railway.business.safetool.mapper.SecScheduledToolMapper;
 import com.railway.business.safetool.domain.SecScheduledTool;
+import com.railway.business.safetool.mapper.SecScheduledToolMapper;
 import com.railway.business.safetool.service.ISecScheduledToolService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.railway.common.utils.SecurityUtils;
-import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
 import java.util.Date;
+import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 /**
 * 安全计划和工具关系表
 * @author lijie
@@ -19,8 +16,13 @@ import java.util.Date;
 @Service
 @Transactional(readOnly = true)
 public class SecScheduledToolServiceImpl implements ISecScheduledToolService{
-@Autowired
-private SecScheduledToolMapper secScheduledToolMapper;
+
+	private final SecScheduledToolMapper secScheduledToolMapper;
+
+	public SecScheduledToolServiceImpl(
+			SecScheduledToolMapper secScheduledToolMapper) {
+		this.secScheduledToolMapper = secScheduledToolMapper;
+	}
 
 	/**
 	* 新增

railway-business/src/main/java/com/railway/business/safetool/service/impl/SecTestRecordServiceImpl.java

@@ -0,0 +1,76 @@
+package com.railway.business.safetool.service.impl;
+
+import com.railway.business.safetool.domain.SecTestRecord;
+import com.railway.business.safetool.mapper.SecTestRecordMapper;
+import com.railway.business.safetool.service.ISecTestRecordService;
+import com.railway.common.utils.SecurityUtils;
+import java.util.Date;
+import java.util.List;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * @author ZhaoMn
+ * @date 2021/12/25
+ */
+@Service
+public class SecTestRecordServiceImpl implements ISecTestRecordService {
+
+  private final SecTestRecordMapper secTestRecordMapper;
+
+  public SecTestRecordServiceImpl(SecTestRecordMapper secTestRecordMapper) {
+    this.secTestRecordMapper = secTestRecordMapper;
+  }
+
+  /**
+   * 新增
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int create(SecTestRecord secTestRecord) {
+    secTestRecord.setCreateTime(new Date());
+    secTestRecord.setCreateBy(SecurityUtils.getUsername());
+    return secTestRecordMapper.insert(secTestRecord);
+  }
+
+  /**
+   * 删除
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int delete(String[] ids) {
+    int r = 0;
+    for (String id : ids) {
+      int j = secTestRecordMapper.delete(id);
+      r = r + j;
+    }
+    return r;
+  }
+
+  /**
+   * 更新
+   */
+  @Override
+  @Transactional(rollbackFor = Exception.class)
+  public int update(SecTestRecord secTestRecord) {
+    secTestRecord.setUpdateTime(new Date());
+    secTestRecord.setUpdateBy(SecurityUtils.getUsername());
+    return secTestRecordMapper.update(secTestRecord);
+  }
+
+  /**
+   * 获取单个
+   */
+  @Override
+  public SecTestRecord getInfo(String id) {
+    return secTestRecordMapper.getInfo(id);
+  }
+
+  /**
+   * 查询列表
+   */
+  @Override
+  public List<SecTestRecord> getList(SecTestRecord secTestRecord) {
+    return secTestRecordMapper.getList(secTestRecord);
+  }
+}

railway-business/src/main/resources/mapper/app/AppFeedbackMapper.xml

@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+  "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.railway.business.app.mapper.AppFeedbackMapper">
+
+  <resultMap id="BaseResultMap" type="com.railway.business.app.domain.AppFeedback">
+    <result column="id" property="id"/>
+    <result column="user_id" property="userId"/>
+    <result column="content" property="content"/>
+    <result column="del_flag" property="delFlag"/>
+    <result column="create_by" property="createBy"/>
+    <result column="create_time" property="createTime"/>
+    <result column="update_by" property="updateBy"/>
+    <result column="update_time" property="updateTime"/>
+  </resultMap>
+
+  <sql id="Base_Column_List">
+    id,
+    user_id,
+    content,
+    del_flag,
+    create_by,
+    create_time,
+    update_by,
+    update_time
+  </sql>
+
+  <insert id="insert" parameterType="com.railway.business.app.domain.AppFeedback">
+    <selectKey keyProperty="id" order="BEFORE" resultType="String">
+      select replace(uuid(), '-', '') from dual
+    </selectKey>
+    INSERT INTO app_feedback
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test='null != userId'>
+        user_id,
+      </if>
+      <if test='null != content'>
+        content,
+      </if>
+      <if test='null != delFlag'>
+        del_flag,
+      </if>
+      <if test='null != createBy'>
+        create_by,
+      </if>
+      <if test='null != createTime'>
+        create_time,
+      </if>
+      <if test='null != updateBy'>
+        update_by,
+      </if>
+      <if test='null != updateTime'>
+        update_time
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test='null != userId'>
+        #{userId},
+      </if>
+      <if test='null != content'>
+        #{content},
+      </if>
+      <if test='null != delFlag'>
+        #{delFlag},
+      </if>
+      <if test='null != createBy'>
+        #{createBy},
+      </if>
+      <if test='null != createTime'>
+        #{createTime},
+      </if>
+      <if test='null != updateBy'>
+        #{updateBy},
+      </if>
+      <if test='null != updateTime'>
+        #{updateTime}
+      </if>
+    </trim>
+  </insert>
+
+  <delete id="delete">
+    UPDATE app_feedback
+    set del_flag='1'
+    WHERE id = #{id}
+  </delete>
+
+  <update id="update" parameterType="com.railway.business.app.domain.AppFeedback">
+    UPDATE app_feedback
+    <set>
+      <if test='null != userId'>user_id = #{userId},</if>
+      <if test='null != content'>content = #{content},</if>
+      <if test='null != delFlag'>del_flag = #{delFlag},</if>
+      <if test='null != createBy'>create_by = #{createBy},</if>
+      <if test='null != createTime'>create_time = #{createTime},</if>
+      <if test='null != updateBy'>update_by = #{updateBy},</if>
+      <if test='null != updateTime'>update_time = #{updateTime}</if>
+    </set>
+    WHERE id = #{id}
+  </update>
+
+
+  <select id="getInfo" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    FROM app_feedback
+    WHERE del_flag='0' and id = #{id}
+
+  </select>
+
+  <select id="getList" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    FROM app_feedback
+    <where>
+      del_flag='0'
+      <if test="userId!=null and userId!=''">
+        and user_id=#{userId}
+      </if>
+      <if test="content!=null and content!=''">
+        and content=#{content}
+      </if>
+      <if test="delFlag!=null and delFlag!=''">
+        and del_flag=#{delFlag}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and create_by=#{createBy}
+      </if>
+      <if test="createTime!=null and createTime!=''">
+        and create_time=#{createTime}
+      </if>
+      <if test="updateBy!=null and updateBy!=''">
+        and update_by=#{updateBy}
+      </if>
+      <if test="updateTime!=null and updateTime!=''">
+        and update_time=#{updateTime}
+      </if>
+    </where>
+  </select>
+
+</mapper>

railway-business/src/main/resources/mapper/safetool/SecTestRecordMapper.xml

@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+  "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.railway.business.safetool.mapper.SecTestRecordMapper">
+
+  <resultMap id="BaseResultMap" type="com.railway.business.safetool.domain.SecTestRecord">
+    <result column="id" property="id"/>
+    <result column="dept_id" property="deptId"/>
+    <result column="store_place" property="storePlace"/>
+    <result column="lab_id" property="labId"/>
+    <result column="closing_time" property="closingTime"/>
+    <result column="apply_user" property="applyUser"/>
+    <result column="test_time" property="testTime"/>
+    <result column="test_user" property="testUser"/>
+    <result column="state" property="state"/>
+    <result column="del_flag" property="delFlag"/>
+    <result column="create_by" property="createBy"/>
+    <result column="create_time" property="createTime"/>
+    <result column="update_by" property="updateBy"/>
+    <result column="update_time" property="updateTime"/>
+  </resultMap>
+
+  <sql id="Base_Column_List">
+    id,
+    dept_id,
+    store_place,
+    lab_id,
+    closing_time,
+    apply_user,
+    test_time,
+    test_user,
+    state,
+    del_flag,
+    create_by,
+    create_time,
+    update_by,
+    update_time
+  </sql>
+
+  <insert id="insert" parameterType="com.railway.business.safetool.domain.SecTestRecord">
+    <selectKey keyProperty="id" order="BEFORE" resultType="String">
+      select replace(uuid(), '-', '') from dual
+    </selectKey>
+    INSERT INTO sec_test_record
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test='null != deptId'>
+        dept_id,
+      </if>
+      <if test='null != storePlace'>
+        store_place,
+      </if>
+      <if test='null != labId'>
+        lab_id,
+      </if>
+      <if test='null != closingTime'>
+        closing_time,
+      </if>
+      <if test='null != applyUser'>
+        apply_user,
+      </if>
+      <if test='null != testTime'>
+        test_time,
+      </if>
+      <if test='null != testUser'>
+        test_user,
+      </if>
+      <if test='null != state'>
+        state,
+      </if>
+      <if test='null != delFlag'>
+        del_flag,
+      </if>
+      <if test='null != createBy'>
+        create_by,
+      </if>
+      <if test='null != createTime'>
+        create_time,
+      </if>
+      <if test='null != updateBy'>
+        update_by,
+      </if>
+      <if test='null != updateTime'>
+        update_time
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test='null != deptId'>
+        #{deptId},
+      </if>
+      <if test='null != storePlace'>
+        #{storePlace},
+      </if>
+      <if test='null != labId'>
+        #{labId},
+      </if>
+      <if test='null != closingTime'>
+        #{closingTime},
+      </if>
+      <if test='null != applyUser'>
+        #{applyUser},
+      </if>
+      <if test='null != testTime'>
+        #{testTime},
+      </if>
+      <if test='null != testUser'>
+        #{testUser},
+      </if>
+      <if test='null != state'>
+        #{state},
+      </if>
+      <if test='null != delFlag'>
+        #{delFlag},
+      </if>
+      <if test='null != createBy'>
+        #{createBy},
+      </if>
+      <if test='null != createTime'>
+        #{createTime},
+      </if>
+      <if test='null != updateBy'>
+        #{updateBy},
+      </if>
+      <if test='null != updateTime'>
+        #{updateTime}
+      </if>
+    </trim>
+  </insert>
+
+  <delete id="delete">
+    UPDATE sec_test_record
+    set del_flag='1'
+    WHERE id = #{id}
+  </delete>
+
+  <update id="update" parameterType="com.railway.business.safetool.domain.SecTestRecord">
+    UPDATE sec_test_record
+    <set>
+      <if test='null != deptId'>dept_id = #{deptId},</if>
+      <if test='null != storePlace'>store_place = #{storePlace},</if>
+      <if test='null != labId'>lab_id = #{labId},</if>
+      <if test='null != closingTime'>closing_time = #{closingTime},</if>
+      <if test='null != applyUser'>apply_user = #{applyUser},</if>
+      <if test='null != testTime'>test_time = #{testTime},</if>
+      <if test='null != testUser'>test_user = #{testUser},</if>
+      <if test='null != state'>state = #{state},</if>
+      <if test='null != delFlag'>del_flag = #{delFlag},</if>
+      <if test='null != createBy'>create_by = #{createBy},</if>
+      <if test='null != createTime'>create_time = #{createTime},</if>
+      <if test='null != updateBy'>update_by = #{updateBy},</if>
+      <if test='null != updateTime'>update_time = #{updateTime}</if>
+    </set>
+    WHERE id = #{id}
+  </update>
+
+
+  <select id="getInfo" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    FROM sec_test_record
+    WHERE del_flag='0' and id = #{id}
+
+  </select>
+
+  <select id="getList" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    FROM sec_test_record
+    <where>
+      del_flag='0'
+      <if test="deptId!=null and deptId!=''">
+        and dept_id=#{deptId}
+      </if>
+      <if test="storePlace!=null and storePlace!=''">
+        and store_place=#{storePlace}
+      </if>
+      <if test="labId!=null and labId!=''">
+        and lab_id=#{labId}
+      </if>
+      <if test="closingTime!=null and closingTime!=''">
+        and closing_time=#{closingTime}
+      </if>
+      <if test="applyUser!=null and applyUser!=''">
+        and apply_user=#{applyUser}
+      </if>
+      <if test="testTime!=null and testTime!=''">
+        and test_time=#{testTime}
+      </if>
+      <if test="testUser!=null and testUser!=''">
+        and test_user=#{testUser}
+      </if>
+      <if test="state!=null and state!=''">
+        and state=#{state}
+      </if>
+      <if test="delFlag!=null and delFlag!=''">
+        and del_flag=#{delFlag}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and create_by=#{createBy}
+      </if>
+      <if test="createTime!=null and createTime!=''">
+        and create_time=#{createTime}
+      </if>
+      <if test="updateBy!=null and updateBy!=''">
+        and update_by=#{updateBy}
+      </if>
+      <if test="updateTime!=null and updateTime!=''">
+        and update_time=#{updateTime}
+      </if>
+    </where>
+  </select>
+
+</mapper>