diff --git a/src/main/java/com/bonus/aqgqj/app/controller/ExperimentalAppController.java b/src/main/java/com/bonus/aqgqj/app/controller/ExperimentalAppController.java index 454e20b..44201f2 100644 --- a/src/main/java/com/bonus/aqgqj/app/controller/ExperimentalAppController.java +++ b/src/main/java/com/bonus/aqgqj/app/controller/ExperimentalAppController.java @@ -4,11 +4,14 @@ import com.bonus.aqgqj.annotation.DecryptAndVerify; import com.bonus.aqgqj.annotation.LogAnnotation; import com.bonus.aqgqj.app.entity.ExperimentalAppVo; import com.bonus.aqgqj.app.entity.ExperimentalDetailAppVo; +import com.bonus.aqgqj.app.entity.SamplesManageAppVo; import com.bonus.aqgqj.app.entity.TestAppVo; import com.bonus.aqgqj.app.entity.dto.ParamsAppDto; import com.bonus.aqgqj.app.service.ExperimentalAppService; import com.bonus.aqgqj.system.vo.EncryptedReq; import com.bonus.aqgqj.utils.ServerResponse; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -35,13 +38,15 @@ public class ExperimentalAppController { @LogAnnotation(operModul = "app试验管理", operation = "查询列表", operDesc = "业务级事件", operType = "查询") // @PreAuthorize("@pms.hasPermission('sys:experimental:query')" ) public ServerResponse getList(EncryptedReq data) { + PageHelper.startPage(data.getData().getPage(), data.getData().getLimit()); try { List list = service.getList(data.getData()); - return ServerResponse.createSuccess(list); + PageInfo pageInfo = new PageInfo<>(list); + return ServerResponse.createSuccessPage(pageInfo,data.getData().getPage(),data.getData().getLimit()); } catch (Exception e) { log.error(e.toString(),e); } - return ServerResponse.createErroe("操作失败"); + return ServerResponse.createErrorPage(data.getData().getPage(),data.getData().getLimit()); } @PostMapping(value = "getDetailList") @@ -49,13 +54,15 @@ public class ExperimentalAppController { @LogAnnotation(operModul = "试验详情管理", operation = "查询试验详情列表", operDesc = "业务级事件", operType = "查询") // @PreAuthorize("@pms.hasPermission('sys:experimentalTest:query')") public ServerResponse getDetailList(EncryptedReq data) { + PageHelper.startPage(data.getData().getPage(), data.getData().getLimit()); try { List list = service.getDetailList(data.getData()); - return ServerResponse.createSuccess(list); + PageInfo pageInfo = new PageInfo<>(list); + return ServerResponse.createSuccessPage(pageInfo,data.getData().getPage(),data.getData().getLimit()); } catch (Exception e) { log.error(e.toString(),e); } - return ServerResponse.createErroe("操作失败"); + return ServerResponse.createErrorPage(data.getData().getPage(),data.getData().getLimit()); } /** diff --git a/src/main/java/com/bonus/aqgqj/app/controller/HomeAppController.java b/src/main/java/com/bonus/aqgqj/app/controller/HomeAppController.java index d58b43e..9ff85c0 100644 --- a/src/main/java/com/bonus/aqgqj/app/controller/HomeAppController.java +++ b/src/main/java/com/bonus/aqgqj/app/controller/HomeAppController.java @@ -1,7 +1,11 @@ package com.bonus.aqgqj.app.controller; +import com.bonus.aqgqj.annotation.DecryptAndVerify; import com.bonus.aqgqj.app.entity.HomeAppVo; +import com.bonus.aqgqj.app.entity.dto.ParamsAppDto; import com.bonus.aqgqj.app.service.HomeAppService; +import com.bonus.aqgqj.basis.entity.dto.ParamsDto; +import com.bonus.aqgqj.system.vo.EncryptedReq; import io.swagger.annotations.Api; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,16 +34,17 @@ public class HomeAppController { * app首页--代办任务统计 */ @PostMapping(value = "getApprovalNum") - public Map getApprovalNum(HomeAppVo vo) { - return service.getApprovalNum(vo); + public Map getApprovalNum() { + return service.getApprovalNum(); } /** * 班组工作情况统计 */ @PostMapping(value = "getATeamNumForEcharts") - public Map getATeamNumForEcharts(HomeAppVo vo) { - return service.getATeamNumForEcharts(vo); + @DecryptAndVerify(decryptedClass = HomeAppVo.class) + public Map getATeamNumForEcharts(EncryptedReq data) { + return service.getATeamNumForEcharts(data.getData()); } /** diff --git a/src/main/java/com/bonus/aqgqj/app/controller/PrimaryDataAppController.java b/src/main/java/com/bonus/aqgqj/app/controller/PrimaryDataAppController.java new file mode 100644 index 0000000..cebad93 --- /dev/null +++ b/src/main/java/com/bonus/aqgqj/app/controller/PrimaryDataAppController.java @@ -0,0 +1,84 @@ +package com.bonus.aqgqj.app.controller; + +import com.bonus.aqgqj.annotation.DecryptAndVerify; +import com.bonus.aqgqj.annotation.LogAnnotation; +import com.bonus.aqgqj.app.entity.ExperimentalAppVo; +import com.bonus.aqgqj.app.entity.ExperimentalDetailAppVo; +import com.bonus.aqgqj.app.entity.SamplesManageAppVo; +import com.bonus.aqgqj.app.entity.dto.ParamsAppDto; +import com.bonus.aqgqj.app.service.PrimaryDataAppService; +import com.bonus.aqgqj.basis.entity.dto.ParamsDto; +import com.bonus.aqgqj.basis.entity.vo.ExperimentalDetailVo; +import com.bonus.aqgqj.basis.entity.vo.ExperimentalVo; +import com.bonus.aqgqj.primaryData.dao.PrimaryDataDao; +import com.bonus.aqgqj.primaryData.service.PrimaryDataService; +import com.bonus.aqgqj.system.vo.EncryptedReq; +import com.bonus.aqgqj.utils.ServerResponse; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** +* @description app 原始记录 +* @author hay +* @date 2024/8/8 13:30 +*/ +@Api(tags = "原始记录") +@RestController +@RequestMapping("/app/primaryDatas/") +public class PrimaryDataAppController { + + private static final Logger log = LoggerFactory.getLogger("adminLogger"); + + @Autowired + private PrimaryDataAppService primaryDataAppService; + + /** + * 根据关键词获取实验设备列表 + * @param data + * @return + */ + @PostMapping(value = "getList") + @DecryptAndVerify(decryptedClass = ParamsAppDto.class) + @LogAnnotation(operModul = "原始数据管理-原始数据管理", operation = "查询原始数据列表", operDesc = "系统级事件",operType="查询") +// @PreAuthorize("@pms.hasPermission('primaryData:primary:query')" ) + public ServerResponse listPrimaryDatas(EncryptedReq data) { + PageHelper.startPage(data.getData().getPage(), data.getData().getLimit()); + try { + List list = primaryDataAppService.getList(data.getData()); + PageInfo pageInfo = new PageInfo<>(list); + return ServerResponse.createSuccessPage(pageInfo,data.getData().getPage(),data.getData().getLimit()); + } catch (Exception e) { + log.error(e.toString(),e); + } + return ServerResponse.createErrorPage(data.getData().getPage(),data.getData().getLimit()); + } + + @PostMapping(value = "getDetailList") + @DecryptAndVerify(decryptedClass = ParamsAppDto.class) + @LogAnnotation(operModul = "试验详情管理", operation = "查询试验详情列表", operDesc = "系统级事件", operType = "查询") +// @PreAuthorize("@pms.hasPermission('sys:experimentalTest:query')") + public ServerResponse getDetailList(EncryptedReq data) { + PageHelper.startPage(data.getData().getPage(), data.getData().getLimit()); + try { + List list = primaryDataAppService.getDetailList(data.getData()); + PageInfo pageInfo = new PageInfo<>(list); + return ServerResponse.createSuccessPage(pageInfo, data.getData().getPage(), data.getData().getLimit()); + } catch (Exception e) { + log.error(e.toString(), e); + } + return ServerResponse.createErrorPage(data.getData().getPage(), data.getData().getLimit()); + } + + +} diff --git a/src/main/java/com/bonus/aqgqj/app/controller/QrCodeController.java b/src/main/java/com/bonus/aqgqj/app/controller/QrCodeController.java new file mode 100644 index 0000000..29642e3 --- /dev/null +++ b/src/main/java/com/bonus/aqgqj/app/controller/QrCodeController.java @@ -0,0 +1,47 @@ +package com.bonus.aqgqj.app.controller; + +import com.bonus.aqgqj.annotation.DecryptAndVerify; +import com.bonus.aqgqj.annotation.LogAnnotation; +import com.bonus.aqgqj.app.entity.SamplesManageAppVo; +import com.bonus.aqgqj.app.service.QrCodeService; +import com.bonus.aqgqj.app.service.SelectAppService; +import com.bonus.aqgqj.system.vo.EncryptedReq; +import com.bonus.aqgqj.system.vo.dto.SelectDto; +import com.bonus.aqgqj.utils.ServerResponse; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** +* @description 二维码扫描 +* @author hay +* @date 2024/8/12 10:34 +*/ +@RestController +@RequestMapping("/app/qrCode/") +@Slf4j +public class QrCodeController { + + @Resource(name = "QrCodeService") + private QrCodeService service; + + + + @PostMapping(value = "getSampleLabelByQrCode") + @DecryptAndVerify(decryptedClass = SamplesManageAppVo.class) + @LogAnnotation(operModul = "收样标签", operation = "扫描二维码获取数据", operDesc = "业务级事件",operType="查询") + public ServerResponse getSampleLabelByQrCode(EncryptedReq data) { + try { + SamplesManageAppVo bean = service.getSampleLabelByQrCode(data.getData()); + return ServerResponse.createSuccess(bean); + }catch (Exception e){ + log.error(e.toString(),e); + } + return ServerResponse.createErroe("操作失败"); + } + +} diff --git a/src/main/java/com/bonus/aqgqj/app/controller/SamplesManageAppController.java b/src/main/java/com/bonus/aqgqj/app/controller/SamplesManageAppController.java index 127bfea..afe0a6c 100644 --- a/src/main/java/com/bonus/aqgqj/app/controller/SamplesManageAppController.java +++ b/src/main/java/com/bonus/aqgqj/app/controller/SamplesManageAppController.java @@ -4,8 +4,11 @@ import com.bonus.aqgqj.annotation.DecryptAndVerify; import com.bonus.aqgqj.annotation.LogAnnotation; import com.bonus.aqgqj.app.entity.SamplesManageAppVo; import com.bonus.aqgqj.app.service.SamplesManageAppService; +import com.bonus.aqgqj.basis.entity.dto.SamplesManageDto; import com.bonus.aqgqj.system.vo.EncryptedReq; import com.bonus.aqgqj.utils.ServerResponse; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,13 +39,63 @@ public class SamplesManageAppController { @LogAnnotation(operModul = "app收样管理", operation = "查询列表", operDesc = "业务级事件",operType="查询") // @PreAuthorize("@pms.hasPermission('sys:samples:query')" ) public ServerResponse getList(EncryptedReq data) { + PageHelper.startPage(data.getData().getPage(), data.getData().getLimit()); try { List list = samplesManageAppService.list(data.getData()); - return ServerResponse.createSuccess(list); + PageInfo pageInfo = new PageInfo<>(list); + return ServerResponse.createSuccessPage(pageInfo,data.getData().getPage(),data.getData().getLimit()); } catch (Exception e) { log.error(e.toString(),e); } - return ServerResponse.createErroe("操作失败"); + return ServerResponse.createErrorPage(data.getData().getPage(),data.getData().getLimit()); + } + + /** + * @description 删除收样列表数据 + */ + @PostMapping("delSamplesList") + @DecryptAndVerify(decryptedClass = SamplesManageAppVo.class) + @LogAnnotation(operModul = "收样管理", operation = "删除收样列表数据", operDesc = "业务级事件", operType = "删除") +// @PreAuthorize("@pms.hasPermission('sys:samples:add')") + public ServerResponse delSamplesList(EncryptedReq vo) { + try { + return samplesManageAppService.delSamplesList(vo.getData()); + }catch (Exception e){ + log.error(e.toString(),e); + return ServerResponse.createErroe("操作失败"); + } + } + + /** + * @description 删除收样详情数据 + */ + @PostMapping("delSamplesDetails") + @DecryptAndVerify(decryptedClass = SamplesManageAppVo.class) + @LogAnnotation(operModul = "收样管理", operation = "删除收样详情数据", operDesc = "业务级事件", operType = "删除") +// @PreAuthorize("@pms.hasPermission('sys:samples:add')") + public ServerResponse delSamplesDetails(EncryptedReq vo) { + try { + return samplesManageAppService.delSamplesDetails(vo.getData()); + }catch (Exception e){ + log.error(e.toString(),e); + return ServerResponse.createErroe("操作失败"); + } + } + + /** + * @description 修改收样信息 + */ + @PostMapping("updateSamplesList") + @DecryptAndVerify(decryptedClass = SamplesManageAppVo.class) + @LogAnnotation(operModul = "收样管理", operation = "修改收样信息", operDesc = "业务级事件", operType = "删除") +// @PreAuthorize("@pms.hasPermission('sys:samples:add')") + public ServerResponse updateSamplesList(EncryptedReq vo) { + try { + return samplesManageAppService.updateSamplesList(vo.getData()); + }catch (Exception e){ + log.error(e.toString(),e); + return ServerResponse.createErroe("操作失败"); + } } @PostMapping(value = "getDetailsList") @@ -50,13 +103,15 @@ public class SamplesManageAppController { @LogAnnotation(operModul = "app收样管理", operation = "收样管理详情", operDesc = "业务级事件",operType="查询") // @PreAuthorize("@pms.hasPermission('sys:samples:query')" ) public ServerResponse getDetailsList(EncryptedReq data) { + PageHelper.startPage(data.getData().getPage(), data.getData().getLimit()); try { List list = samplesManageAppService.getDetailsList(data.getData()); - return ServerResponse.createSuccess(list); + PageInfo pageInfo = new PageInfo<>(list); + return ServerResponse.createSuccessPage(pageInfo,data.getData().getPage(),data.getData().getLimit()); } catch (Exception e) { log.error(e.toString(),e); } - return ServerResponse.createErroe("操作失败"); + return ServerResponse.createErrorPage(data.getData().getPage(),data.getData().getLimit()); } @PostMapping(value = "getSampleLabelData") @@ -119,17 +174,4 @@ public class SamplesManageAppController { return ServerResponse.createErroe("操作失败"); } - @PostMapping(value = "getSampleLabelByQrCode") - @DecryptAndVerify(decryptedClass = SamplesManageAppVo.class) - @LogAnnotation(operModul = "收样标签", operation = "扫描二维码获取收样标签", operDesc = "业务级事件",operType="查询") -// @PreAuthorize("@pms.hasPermission('sys:samples:query')" ) - public ServerResponse getSampleLabelByQrCode(EncryptedReq data) { - try { - SamplesManageAppVo bean = samplesManageAppService.getSampleLabelByQrCode(data.getData()); - return ServerResponse.createSuccess(bean); - }catch (Exception e){ - log.error(e.toString(),e); - } - return ServerResponse.createErroe("操作失败"); - } } diff --git a/src/main/java/com/bonus/aqgqj/app/controller/SelectAppController.java b/src/main/java/com/bonus/aqgqj/app/controller/SelectAppController.java index 38c4968..ad8149e 100644 --- a/src/main/java/com/bonus/aqgqj/app/controller/SelectAppController.java +++ b/src/main/java/com/bonus/aqgqj/app/controller/SelectAppController.java @@ -34,9 +34,10 @@ public class SelectAppController { * 查询所有工器具 */ @PostMapping(value = "getToolsSelect") - public ServerResponse getToolsSelect() { + @DecryptAndVerify(decryptedClass = SamplesManageAppVo.class) + public ServerResponse getToolsSelect(EncryptedReq data) { try { - List list = service.getToolsSelect(); + List list = service.getToolsSelect(data.getData()); return ServerResponse.createSuccess(list); }catch (Exception e){ log.error(e.toString(),e); diff --git a/src/main/java/com/bonus/aqgqj/app/dao/HomeAppDao.java b/src/main/java/com/bonus/aqgqj/app/dao/HomeAppDao.java index f79bd42..763db89 100644 --- a/src/main/java/com/bonus/aqgqj/app/dao/HomeAppDao.java +++ b/src/main/java/com/bonus/aqgqj/app/dao/HomeAppDao.java @@ -14,10 +14,9 @@ import java.util.List; public interface HomeAppDao { /** * 获取代办任务 - * @param vo * @return */ - List getApprovalNum(HomeAppVo vo); + List getApprovalNum(); /** * 获取班组 diff --git a/src/main/java/com/bonus/aqgqj/app/dao/PrimaryDataAppDao.java b/src/main/java/com/bonus/aqgqj/app/dao/PrimaryDataAppDao.java new file mode 100644 index 0000000..b624a4e --- /dev/null +++ b/src/main/java/com/bonus/aqgqj/app/dao/PrimaryDataAppDao.java @@ -0,0 +1,51 @@ +package com.bonus.aqgqj.app.dao; + +import com.bonus.aqgqj.app.entity.ExperimentalAppVo; +import com.bonus.aqgqj.app.entity.ExperimentalDetailAppVo; +import com.bonus.aqgqj.app.entity.dto.ParamsAppDto; +import com.bonus.aqgqj.basis.entity.dto.ParamsDto; +import com.bonus.aqgqj.basis.entity.vo.ExperimentalDetailVo; +import com.bonus.aqgqj.basis.entity.vo.ExperimentalVo; +import org.apache.ibatis.annotations.MapKey; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +/** +* @description app原始记录 +* @author hay +* @date 2024/8/8 13:46 +*/ +@Mapper +public interface PrimaryDataAppDao { + + /** + * 原始数据列表 + * @param data + * @return + */ + List getList(ParamsAppDto data); + + /** + * 试验详情列表 + * + * @param dto + * @return List + * @author cwchen + * @date 2024/7/20 13:27 + */ + List getDetailList(ParamsAppDto dto); + + /** + * 查询试验设备数量 + * + * @param experId + * @return List + * @author cwchen + * @date 2024/7/22 10:58 + */ + @MapKey("id") + List> getExperDevItemsNum(Long experId); + +} diff --git a/src/main/java/com/bonus/aqgqj/app/dao/QrCodeDao.java b/src/main/java/com/bonus/aqgqj/app/dao/QrCodeDao.java new file mode 100644 index 0000000..05c8368 --- /dev/null +++ b/src/main/java/com/bonus/aqgqj/app/dao/QrCodeDao.java @@ -0,0 +1,34 @@ +package com.bonus.aqgqj.app.dao; + +import com.bonus.aqgqj.app.entity.ExperDeviceAppVo; +import com.bonus.aqgqj.app.entity.SamplesManageAppVo; +import com.bonus.aqgqj.base.entity.SelectEntity; +import com.bonus.aqgqj.basis.entity.vo.ConfigItemsVo; +import com.bonus.aqgqj.system.vo.dto.SelectDto; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** +* @description 二维码扫描 +* @author hay +* @date 2024/8/1 17:30 +*/ +@Repository("QrCodeDao") +public interface QrCodeDao { + + /** + * 获取收样标签数据 + * @param data + * @return + */ + SamplesManageAppVo getSampleLabelByQrCode(SamplesManageAppVo data); + + /** + * 获取实验项 + * @param dto + * @return + */ + List getTestItemList(SamplesManageAppVo dto); + +} diff --git a/src/main/java/com/bonus/aqgqj/app/dao/SamplesManageAppDao.java b/src/main/java/com/bonus/aqgqj/app/dao/SamplesManageAppDao.java index 9abd220..28dee8e 100644 --- a/src/main/java/com/bonus/aqgqj/app/dao/SamplesManageAppDao.java +++ b/src/main/java/com/bonus/aqgqj/app/dao/SamplesManageAppDao.java @@ -98,9 +98,31 @@ public interface SamplesManageAppDao { Integer getIdByBatchCode(String batchCode); /** - * 获取收样标签数据 + * 删除收样数据 tb_samples_device * @param data * @return */ - SamplesManageAppVo getSampleLabelByQrCode(SamplesManageAppVo data); + int delSamplesDetails(SamplesManageAppVo data); + + /** + * 删除收样数据 tb_samples + * @param data + * @return + */ + int delSamplesList(SamplesManageAppVo data); + + /** + * 修改收样数据 tb_samples + * @param data + * @return + */ + int updateSamplesList(SamplesManageAppVo data); + + /** + * 删除收样数据 tb_samples_device + * 根据详情id + * @param data + * @return + */ + int delSamplesDetailsList(SamplesManageAppVo data); } diff --git a/src/main/java/com/bonus/aqgqj/app/dao/SelectAppDao.java b/src/main/java/com/bonus/aqgqj/app/dao/SelectAppDao.java index fb08776..9dce889 100644 --- a/src/main/java/com/bonus/aqgqj/app/dao/SelectAppDao.java +++ b/src/main/java/com/bonus/aqgqj/app/dao/SelectAppDao.java @@ -18,9 +18,10 @@ import java.util.List; public interface SelectAppDao { /** * 工器具下拉选 + * @param data * @return List */ - List getToolsSelect(); + List getToolsSelect(SamplesManageAppVo data); /** * 获取所有试验班组 diff --git a/src/main/java/com/bonus/aqgqj/app/entity/dto/ParamsAppDto.java b/src/main/java/com/bonus/aqgqj/app/entity/dto/ParamsAppDto.java index 0a3bd3d..30d8c03 100644 --- a/src/main/java/com/bonus/aqgqj/app/entity/dto/ParamsAppDto.java +++ b/src/main/java/com/bonus/aqgqj/app/entity/dto/ParamsAppDto.java @@ -29,6 +29,11 @@ public class ParamsAppDto extends PageEntity { */ private String devTypeCode; + /** + * 设备类型 + */ + private String sampleDev; + /** * 送样日期 */ diff --git a/src/main/java/com/bonus/aqgqj/app/service/HomeAppService.java b/src/main/java/com/bonus/aqgqj/app/service/HomeAppService.java index a279a71..3692fb7 100644 --- a/src/main/java/com/bonus/aqgqj/app/service/HomeAppService.java +++ b/src/main/java/com/bonus/aqgqj/app/service/HomeAppService.java @@ -13,10 +13,9 @@ public interface HomeAppService { /** * 代办任务数量 - * @param vo * @return */ - Map getApprovalNum(HomeAppVo vo); + Map getApprovalNum(); /** * 班组工作情况统计 diff --git a/src/main/java/com/bonus/aqgqj/app/service/PrimaryDataAppService.java b/src/main/java/com/bonus/aqgqj/app/service/PrimaryDataAppService.java new file mode 100644 index 0000000..875bdb7 --- /dev/null +++ b/src/main/java/com/bonus/aqgqj/app/service/PrimaryDataAppService.java @@ -0,0 +1,36 @@ +package com.bonus.aqgqj.app.service; + +import com.bonus.aqgqj.app.entity.ExperimentalAppVo; +import com.bonus.aqgqj.app.entity.ExperimentalDetailAppVo; +import com.bonus.aqgqj.app.entity.dto.ParamsAppDto; +import com.bonus.aqgqj.basis.entity.dto.ParamsDto; +import com.bonus.aqgqj.basis.entity.vo.ExperimentalDetailVo; +import com.bonus.aqgqj.basis.entity.vo.ExperimentalVo; + +import java.util.List; + +/** +* @description App原始记录 +* @author hay +* @date 2024/8/8 13:47 +*/ +public interface PrimaryDataAppService { + + /** + * 原始数据列表 + * @param data + * @return + */ + List getList(ParamsAppDto data); + + /** + * 试验详情列表 + * + * @param data + * @return List + * @author cwchen + * @date 2024/7/20 13:26 + */ + List getDetailList(ParamsAppDto data); + +} diff --git a/src/main/java/com/bonus/aqgqj/app/service/QrCodeService.java b/src/main/java/com/bonus/aqgqj/app/service/QrCodeService.java new file mode 100644 index 0000000..8654e5a --- /dev/null +++ b/src/main/java/com/bonus/aqgqj/app/service/QrCodeService.java @@ -0,0 +1,23 @@ +package com.bonus.aqgqj.app.service; + + +import com.bonus.aqgqj.app.entity.SamplesManageAppVo; +import com.bonus.aqgqj.system.vo.dto.SelectDto; +import com.bonus.aqgqj.utils.ServerResponse; + +import java.util.List; + +/** + * @author hay + * 二维码扫描 + */ +public interface QrCodeService { + + /** + * 收样标签 信息获取 + * @param data + * @return + */ + SamplesManageAppVo getSampleLabelByQrCode(SamplesManageAppVo data); + +} diff --git a/src/main/java/com/bonus/aqgqj/app/service/SamplesManageAppService.java b/src/main/java/com/bonus/aqgqj/app/service/SamplesManageAppService.java index ea379d3..448dd99 100644 --- a/src/main/java/com/bonus/aqgqj/app/service/SamplesManageAppService.java +++ b/src/main/java/com/bonus/aqgqj/app/service/SamplesManageAppService.java @@ -53,9 +53,23 @@ public interface SamplesManageAppService { SamplesManageAppVo getSampleLabelData(SamplesManageAppVo data); /** - * 收样标签 信息获取 + * 删除收样列表数据 * @param data * @return */ - SamplesManageAppVo getSampleLabelByQrCode(SamplesManageAppVo data); + ServerResponse delSamplesList(SamplesManageAppVo data); + + /** + * 修改收样列表数据 + * @param data + * @return + */ + ServerResponse updateSamplesList(SamplesManageAppVo data); + + /** + * 删除收样详情数据 + * @param data + * @return + */ + ServerResponse delSamplesDetails(SamplesManageAppVo data); } diff --git a/src/main/java/com/bonus/aqgqj/app/service/SelectAppService.java b/src/main/java/com/bonus/aqgqj/app/service/SelectAppService.java index b4b5140..76b2519 100644 --- a/src/main/java/com/bonus/aqgqj/app/service/SelectAppService.java +++ b/src/main/java/com/bonus/aqgqj/app/service/SelectAppService.java @@ -16,10 +16,10 @@ public interface SelectAppService { /** * 获取工器具下拉选 - * @param + * @param data * @return */ - List getToolsSelect(); + List getToolsSelect(SamplesManageAppVo data); /** * 获取试验班组下拉选 diff --git a/src/main/java/com/bonus/aqgqj/app/service/impl/HomeAppServiceImpl.java b/src/main/java/com/bonus/aqgqj/app/service/impl/HomeAppServiceImpl.java index 3de3155..2c97533 100644 --- a/src/main/java/com/bonus/aqgqj/app/service/impl/HomeAppServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/app/service/impl/HomeAppServiceImpl.java @@ -31,10 +31,10 @@ public class HomeAppServiceImpl implements HomeAppService { * 获取代办任务数量 */ @Override - public Map getApprovalNum(HomeAppVo vo) { + public Map getApprovalNum() { Map map=new HashMap<>(); try{ - List list=dao.getApprovalNum(vo); + List list=dao.getApprovalNum(); HomeAppVo hvo=list.get(0); map.put("data",hvo); map.put("code","200"); diff --git a/src/main/java/com/bonus/aqgqj/app/service/impl/PrimaryDataAppServiceImpl.java b/src/main/java/com/bonus/aqgqj/app/service/impl/PrimaryDataAppServiceImpl.java new file mode 100644 index 0000000..6e55d54 --- /dev/null +++ b/src/main/java/com/bonus/aqgqj/app/service/impl/PrimaryDataAppServiceImpl.java @@ -0,0 +1,76 @@ +package com.bonus.aqgqj.app.service.impl; + +import com.alibaba.fastjson.JSONArray; +import com.bonus.aqgqj.app.dao.PrimaryDataAppDao; +import com.bonus.aqgqj.app.entity.ExperimentalAppVo; +import com.bonus.aqgqj.app.entity.ExperimentalDetailAppVo; +import com.bonus.aqgqj.app.entity.dto.ParamsAppDto; +import com.bonus.aqgqj.app.service.PrimaryDataAppService; +import com.bonus.aqgqj.basis.entity.dto.ParamsDto; +import com.bonus.aqgqj.basis.entity.vo.ExperimentalDetailVo; +import com.bonus.aqgqj.basis.entity.vo.ExperimentalVo; +import com.bonus.aqgqj.primaryData.dao.PrimaryDataDao; +import com.bonus.aqgqj.primaryData.service.PrimaryDataService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** +* @description App原始记录 +* @author hay +* @date 2024/8/8 13:47 +*/ +@Slf4j +@Service +public class PrimaryDataAppServiceImpl implements PrimaryDataAppService { + + + @Resource + private PrimaryDataAppDao primaryDataAppDao; + + + /** + * 获取列表 + */ + @Override + public List getList(ParamsAppDto dto) { + List list = new ArrayList<>(); + try { + list = primaryDataAppDao.getList(dto); + } catch (Exception e) { + log.error(e.toString(), e); + } + return list; + } + + @Override + public List getDetailList(ParamsAppDto dto) { + List list = new ArrayList<>(); + try { + list = primaryDataAppDao.getDetailList(dto); + if (CollectionUtils.isNotEmpty(list)) { + for (ExperimentalDetailAppVo detailVo : list) { + // 样品试验结果、样品数量、送样总数 + List sampleList = new ArrayList<>(); + if (detailVo.getExperId() != null) { + List> mapList = primaryDataAppDao.getExperDevItemsNum(detailVo.getExperId()); + JSONArray jsonArray = new JSONArray(); + jsonArray.addAll(mapList); + sampleList = jsonArray.toJavaList(ExperimentalDetailAppVo.Sample.class); + } + detailVo.setSampleList(sampleList); + detailVo.setSampleQuantity(sampleList.size()); + } + } + } catch (Exception e) { + log.error(e.toString(), e); + } + return list; + } + +} diff --git a/src/main/java/com/bonus/aqgqj/app/service/impl/QrCodeImpl.java b/src/main/java/com/bonus/aqgqj/app/service/impl/QrCodeImpl.java new file mode 100644 index 0000000..1eb1f77 --- /dev/null +++ b/src/main/java/com/bonus/aqgqj/app/service/impl/QrCodeImpl.java @@ -0,0 +1,71 @@ +package com.bonus.aqgqj.app.service.impl; + +import com.bonus.aqgqj.app.dao.QrCodeDao; +import com.bonus.aqgqj.app.dao.SelectAppDao; +import com.bonus.aqgqj.app.entity.ExperDeviceAppVo; +import com.bonus.aqgqj.app.entity.SamplesManageAppVo; +import com.bonus.aqgqj.app.service.QrCodeService; +import com.bonus.aqgqj.app.service.SelectAppService; +import com.bonus.aqgqj.base.entity.SelectEntity; +import com.bonus.aqgqj.basis.entity.vo.ConfigItemsVo; +import com.bonus.aqgqj.system.vo.dto.SelectDto; +import com.bonus.aqgqj.utils.ServerResponse; +import com.bonus.aqgqj.utils.StringHelper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * @author hay + * 二维码扫描 + */ +@Service("QrCodeService") +@Slf4j +public class QrCodeImpl implements QrCodeService { + + @Resource(name = "QrCodeDao") + private QrCodeDao dao; + + + /** + * 获取收样标签数据 + */ + @Override + public SamplesManageAppVo getSampleLabelByQrCode(SamplesManageAppVo data) { + SamplesManageAppVo dto = new SamplesManageAppVo(); + //先判断customerCode是否为空 + if (StringHelper.isNotEmpty(data.getCustomerCode())){ + //将customerCode用/分割 + String[] customerCode = data.getCustomerCode().split("/"); + if ("sybq".equals(customerCode[0])){ + //收样标签 + data.setCustomerCode(customerCode[1]); + dto = getSampleLabelData(data); + } + }else { + throw new RuntimeException("customerCode不能为空"); + } + return dto; + } + + /** + * 获取收样标签数据 + */ + private SamplesManageAppVo getSampleLabelData(SamplesManageAppVo data) { + //查询详情数据 + SamplesManageAppVo dto = dao.getSampleLabelByQrCode(data); + if (dto!=null){ + //查询试验项目 + data.setId(dto.getId()); + List itemList = dao.getTestItemList(data); + if (itemList.size()>0){ + dto.setConfigItemsVos(itemList); + } + } + return dto; + } + +} diff --git a/src/main/java/com/bonus/aqgqj/app/service/impl/SamplesManageAppServiceImpl.java b/src/main/java/com/bonus/aqgqj/app/service/impl/SamplesManageAppServiceImpl.java index d670c0b..0254769 100644 --- a/src/main/java/com/bonus/aqgqj/app/service/impl/SamplesManageAppServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/app/service/impl/SamplesManageAppServiceImpl.java @@ -156,21 +156,69 @@ public class SamplesManageAppServiceImpl implements SamplesManageAppService { } /** - * 获取收样标签数据 + * 删除收样数据 */ @Override - public SamplesManageAppVo getSampleLabelByQrCode(SamplesManageAppVo data) { - //查询详情数据 - SamplesManageAppVo dto = samplesManageAppDao.getSampleLabelByQrCode(data); - if (dto!=null){ - //查询试验项目 - data.setId(dto.getId()); - List itemList = samplesManageAppDao.getTestItemList(data); - if (itemList.size()>0){ - dto.setConfigItemsVos(itemList); + @Transactional(rollbackFor = Exception.class) + public ServerResponse delSamplesList(SamplesManageAppVo data) { + //先判断id是否为空 + if (data.getId() != null){ + //获取登录人id + Integer userId = Integer.parseInt(UserUtil.getLoginUser().getId().toString()); + data.setUpdateBy(userId); + //先删除详情 + int res = samplesManageAppDao.delSamplesDetails(data); + if (res>0){ + //再删除列表 + int res2 = samplesManageAppDao.delSamplesList(data); + if (res2>0){ + return ServerResponse.createBySuccessMsg("删除成功"); + }else { + throw new RuntimeException("收样单位信息表删除失败"); + } + }else { + throw new RuntimeException("收样设备信息表删除失败"); } + }else { + throw new RuntimeException("未获取到数据"); + } + } + + /** + * 修改收样单位等信息 + */ + @Override + public ServerResponse updateSamplesList(SamplesManageAppVo data) { + Integer userId = Integer.parseInt(UserUtil.getLoginUser().getId().toString()); + data.setUpdateBy(userId); + int res = samplesManageAppDao.updateSamplesList(data); + if (res>0){ + return ServerResponse.createBySuccessMsg("修改成功"); + }else { + throw new RuntimeException("修改失败"); + } + } + + /** + * 删除收样设备信息 tb_sample_device + */ + @Override + public ServerResponse delSamplesDetails(SamplesManageAppVo data) { + //先判断id是否为空 + if (data.getId() != null) { + //获取登录人id + Integer userId = Integer.parseInt(UserUtil.getLoginUser().getId().toString()); + data.setUpdateBy(userId); + //删除详情 + int res = samplesManageAppDao.delSamplesDetailsList(data); + if (res > 0) { + return ServerResponse.createBySuccessMsg("删除成功"); + } else { + throw new RuntimeException("收样设备信息表删除失败"); + } + } else { + throw new RuntimeException("未获取到数据"); } - return dto; } @Override diff --git a/src/main/java/com/bonus/aqgqj/app/service/impl/SelectServiceAppImpl.java b/src/main/java/com/bonus/aqgqj/app/service/impl/SelectServiceAppImpl.java index 2134b9a..224409b 100644 --- a/src/main/java/com/bonus/aqgqj/app/service/impl/SelectServiceAppImpl.java +++ b/src/main/java/com/bonus/aqgqj/app/service/impl/SelectServiceAppImpl.java @@ -35,8 +35,8 @@ public class SelectServiceAppImpl implements SelectAppService { * 获取工器具下拉选 */ @Override - public List getToolsSelect() { - return mapper.getToolsSelect(); + public List getToolsSelect(SamplesManageAppVo data) { + return mapper.getToolsSelect(data); } /** diff --git a/src/main/java/com/bonus/aqgqj/config/BnsSecurityConfig.java b/src/main/java/com/bonus/aqgqj/config/BnsSecurityConfig.java index 1ac17f3..d90f30f 100644 --- a/src/main/java/com/bonus/aqgqj/config/BnsSecurityConfig.java +++ b/src/main/java/com/bonus/aqgqj/config/BnsSecurityConfig.java @@ -1,5 +1,6 @@ package com.bonus.aqgqj.config; +import com.bonus.aqgqj.filter.OptionsRequestFilter; import com.bonus.aqgqj.filter.TokenFilter; import com.bonus.aqgqj.system.service.impl.UserDetailsServiceImpl; import org.springframework.beans.factory.annotation.Autowired; @@ -39,6 +40,8 @@ public class BnsSecurityConfig extends WebSecurityConfigurerAdapter { private UserDetailsServiceImpl userDetailsService; @Autowired private TokenFilter tokenFilter; +// @Autowired +// private OptionsRequestFilter optionsRequestFilter; @Bean public BCryptPasswordEncoder bCryptPasswordEncoder() { @@ -52,7 +55,7 @@ public class BnsSecurityConfig extends WebSecurityConfigurerAdapter { http.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS); http.authorizeRequests() .antMatchers("/", "/*.html", "/favicon.ico", "/css/**", "/js/**", "/fonts/**", "/layui/**", "/img/**" - , "/webjars/**", "/pages/**", + , "/webjars/**", "/pages/**","/login", "/statics/**","/websocketServer/**") .permitAll().anyRequest().authenticated(); http.formLogin().loginProcessingUrl("/login") @@ -62,6 +65,7 @@ public class BnsSecurityConfig extends WebSecurityConfigurerAdapter { // 解决不允许显示在iframe的问题 http.headers().frameOptions().disable(); http.headers().cacheControl(); +// http.addFilter(optionsRequestFilter); http.addFilterBefore(tokenFilter, UsernamePasswordAuthenticationFilter.class); } diff --git a/src/main/java/com/bonus/aqgqj/config/WebMvcConfig.java b/src/main/java/com/bonus/aqgqj/config/WebMvcConfig.java index 5f7449b..1e8aaf3 100644 --- a/src/main/java/com/bonus/aqgqj/config/WebMvcConfig.java +++ b/src/main/java/com/bonus/aqgqj/config/WebMvcConfig.java @@ -27,7 +27,12 @@ public class WebMvcConfig implements WebMvcConfigurer { return new WebMvcConfigurer() { @Override public void addCorsMappings(CorsRegistry registry) { - registry.addMapping("/**").allowedMethods("*"); + registry.addMapping("/**").allowedMethods("*"); +// registry.addMapping("/**") +// .allowedOrigins("http://example.com") +// .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS") +// .allowedHeaders("*") +// .allowCredentials(true); } }; } diff --git a/src/main/java/com/bonus/aqgqj/filter/OptionsRequestFilter.java b/src/main/java/com/bonus/aqgqj/filter/OptionsRequestFilter.java new file mode 100644 index 0000000..525d9bc --- /dev/null +++ b/src/main/java/com/bonus/aqgqj/filter/OptionsRequestFilter.java @@ -0,0 +1,41 @@ +package com.bonus.aqgqj.filter; + +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; + +import javax.servlet.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * @author 16043 + */ +@Component +@Order(1) +public class OptionsRequestFilter implements Filter { + + @Override + public void init(FilterConfig filterConfig) throws ServletException { + // TODO Auto-generated method stub + } + + + @Override + public void doFilter(ServletRequest req, ServletResponse res, + FilterChain chain) throws IOException, ServletException { + HttpServletResponse response = (HttpServletResponse) res; + response.setHeader("Access-Control-Allow-Origin", "*"); + response.setHeader("Access-Control-Allow-Methods", + "POST, GET, OPTIONS, DELETE"); + response.setHeader("Access-Control-Max-Age", "3600"); + response.setHeader("Access-Control-Allow-Headers", + "Content-Type, x-requested-with, X-Custom-Header, Token,Authorization"); + chain.doFilter(req, res); + } + + @Override + public void destroy() { + // TODO Auto-generated method stub + } +} \ No newline at end of file diff --git a/src/main/java/com/bonus/aqgqj/filter/TokenFilter.java b/src/main/java/com/bonus/aqgqj/filter/TokenFilter.java index 040b8b0..fb04e99 100644 --- a/src/main/java/com/bonus/aqgqj/filter/TokenFilter.java +++ b/src/main/java/com/bonus/aqgqj/filter/TokenFilter.java @@ -1,8 +1,7 @@ package com.bonus.aqgqj.filter; import java.io.IOException; -import java.util.List; -import java.util.UUID; +import java.util.*; import javax.annotation.Resource; import javax.servlet.FilterChain; @@ -19,6 +18,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.annotation.Order; import org.springframework.http.HttpStatus; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; @@ -37,7 +37,7 @@ public class TokenFilter extends OncePerRequestFilter { public static final String TOKEN_KEY = "token"; - + public static final String HEAD_KEY = "Token"; public static Boolean aqEnable; /** * 拦截的文件后缀 @@ -74,11 +74,23 @@ public class TokenFilter extends OncePerRequestFilter { @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { + String method= request.getMethod(); + if("options".equals(method.toLowerCase())){ + response.setHeader("Access-Control-Allow-Origin", "*"); + response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE"); + response.setHeader("Access-Control-Max-Age", "3600"); + response.setHeader("Access-Control-Allow-Headers", "Content-Type, x-requested-with, X-Custom-Header, Token,Authorization"); + UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(new LoginUser(), + null, null); + SecurityContextHolder.getContext().setAuthentication(authentication); + filterChain.doFilter(request, response); + }else{ + Enumeration headerNames= request.getHeaderNames(); + Map map = new HashMap(); String uri=request.getRequestURI(); String token = getToken(request); - Boolean isYq=setErrorSpore(response,token,uri,request);//页面越权校验 - - Boolean isConfig= setSystemConfig(response,request);//系统配置验证 + Boolean isYq=setErrorSpore(response,token,uri,request); + Boolean isConfig= setSystemConfig(response,request); if(isConfig){ System.err.println("越权了"); log.info("配置校验{}",isConfig); @@ -103,7 +115,7 @@ public class TokenFilter extends OncePerRequestFilter { } filterChain.doFilter(request, response); } - + } } @@ -164,7 +176,12 @@ public class TokenFilter extends OncePerRequestFilter { return false; } } - if(StringHelper.isNotEmpty(token)){//包含token + + //包含token + if(StringHelper.isNotEmpty(token)){ + if(url.contains("/app/")){ + return false; + } String roid=JwtHelper.getRoleId(token); List menus=menuService.getUserMenuList( "1",roid,url); for (SysMenuVo menu:menus) { @@ -307,8 +324,8 @@ public class TokenFilter extends OncePerRequestFilter { */ public static String getToken(HttpServletRequest request) { String token = request.getParameter(TOKEN_KEY); - if (StringUtils.isBlank(token)) { - token = request.getHeader(TOKEN_KEY); + if (StringUtils.isEmpty(token)) { + token = request.getHeader(HEAD_KEY); } return token; diff --git a/src/main/java/com/bonus/aqgqj/system/service/impl/TokenServiceImpl.java b/src/main/java/com/bonus/aqgqj/system/service/impl/TokenServiceImpl.java index e4430d8..33a6f79 100644 --- a/src/main/java/com/bonus/aqgqj/system/service/impl/TokenServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/system/service/impl/TokenServiceImpl.java @@ -39,7 +39,7 @@ public class TokenServiceImpl implements TokenService { // 登陆日志 // logService.save(loginUser.getId(), "登陆", true, null); - return new Token(token, loginUser.getLoginTime()); + return new Token(token, loginUser.getLoginTime(),200); } private void cacheLoginUser(LoginUser loginUser) { diff --git a/src/main/java/com/bonus/aqgqj/system/vo/Token.java b/src/main/java/com/bonus/aqgqj/system/vo/Token.java index 17e856d..aa36096 100644 --- a/src/main/java/com/bonus/aqgqj/system/vo/Token.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/Token.java @@ -17,10 +17,13 @@ public class Token implements Serializable { /** 登陆时间戳（毫秒） */ private Long loginTime; - public Token(String token, Long loginTime) { + private Integer code; + + public Token(String token, Long loginTime, Integer code) { super(); this.token = token; this.loginTime = loginTime; + this.code = code; } public String getToken() { @@ -39,4 +42,11 @@ public class Token implements Serializable { this.loginTime = loginTime; } + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } } diff --git a/src/main/java/com/bonus/aqgqj/utils/ResponseUtil.java b/src/main/java/com/bonus/aqgqj/utils/ResponseUtil.java index b410a8e..6c14c5f 100644 --- a/src/main/java/com/bonus/aqgqj/utils/ResponseUtil.java +++ b/src/main/java/com/bonus/aqgqj/utils/ResponseUtil.java @@ -11,7 +11,7 @@ public class ResponseUtil { public static void responseJson(HttpServletResponse response, int status, Object data) { try { response.setHeader("Access-Control-Allow-Origin", "*"); - response.setHeader("Access-Control-Allow-Methods", "*"); + response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS"); response.setContentType("application/json;charset=UTF-8"); response.setStatus(status); diff --git a/src/main/resources/mappers/app/PrimaryDataAppMapper.xml b/src/main/resources/mappers/app/PrimaryDataAppMapper.xml new file mode 100644 index 0000000..ccacafb --- /dev/null +++ b/src/main/resources/mappers/app/PrimaryDataAppMapper.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mappers/app/QrCodeMapper.xml b/src/main/resources/mappers/app/QrCodeMapper.xml new file mode 100644 index 0000000..abe31b7 --- /dev/null +++ b/src/main/resources/mappers/app/QrCodeMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mappers/app/SamplesManageAppMapper.xml b/src/main/resources/mappers/app/SamplesManageAppMapper.xml index b0f5fac..e8a0b68 100644 --- a/src/main/resources/mappers/app/SamplesManageAppMapper.xml +++ b/src/main/resources/mappers/app/SamplesManageAppMapper.xml @@ -50,11 +50,44 @@ update_user=#{updateBy} WHERE id = #{id} + + UPDATE tb_sample_device + SET del_falg = '1', + update_time = NOW(), + update_user = #{updateBy} + WHERE sample_id = #{id} + + + UPDATE tb_sample + SET del_flag = '1', + update_time = NOW(), + update_user = #{updateBy} + WHERE id = #{id} + + + UPDATE tb_sample + SET custom_id = #{customId}, + custom_name = #{customName}, + sample_user = #{sampleUser}, + sample_time = #{sampleTime}, + update_time = NOW(), + update_user = #{updateBy} + WHERE id = #{id} + + + UPDATE tb_sample_device + SET del_falg = '1', + update_time = NOW(), + update_user = #{updateBy} + WHERE id = #{id} + - \ No newline at end of file diff --git a/src/main/resources/mappers/app/SelectAppMapper.xml b/src/main/resources/mappers/app/SelectAppMapper.xml index 0fc9b50..36e9582 100644 --- a/src/main/resources/mappers/app/SelectAppMapper.xml +++ b/src/main/resources/mappers/app/SelectAppMapper.xml @@ -11,6 +11,9 @@ where p_id = 92 and del_flag = 0 + + and dict_name like concat('%',#{keyWord},'%') +