diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java index 32d9e03..f3e306b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java @@ -50,6 +50,9 @@ public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody AppPushInfo pushInfo) { if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { return pushInfoService.addPushInfo(pushInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)){ + //只更新已读状态 + return pushInfoService.updatePushInfo(pushInfo); }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ return pushInfoService.deletePushInfo(pushInfo); }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ @@ -64,8 +67,8 @@ @PostMapping("/detail") @ResponseBody public Object detail(AppPushInfo pushInfo) { - AppPushInfo pushInfos = pushInfoService.pushInfoDetail(pushInfo); - return ResponseData.success(pushInfos); + AppPushInfo info = pushInfoService.pushInfoDetail(pushInfo); + return ResponseData.success(info); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java index 32d9e03..f3e306b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java @@ -50,6 +50,9 @@ public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody AppPushInfo pushInfo) { if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { return pushInfoService.addPushInfo(pushInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)){ + //只更新已读状态 + return pushInfoService.updatePushInfo(pushInfo); }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ return pushInfoService.deletePushInfo(pushInfo); }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ @@ -64,8 +67,8 @@ @PostMapping("/detail") @ResponseBody public Object detail(AppPushInfo pushInfo) { - AppPushInfo pushInfos = pushInfoService.pushInfoDetail(pushInfo); - return ResponseData.success(pushInfos); + AppPushInfo info = pushInfoService.pushInfoDetail(pushInfo); + return ResponseData.success(info); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java index 07e59e3..a7e6b26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java @@ -14,10 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + import java.util.Date; import java.util.Objects; @@ -82,4 +80,11 @@ } } + //根据用户id查用户信息 + @GetMapping("/info") + public Object info(String account) { + User user = this.userService.getByAccount(account); + return ResponseData.success(user); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java index 32d9e03..f3e306b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java @@ -50,6 +50,9 @@ public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody AppPushInfo pushInfo) { if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { return pushInfoService.addPushInfo(pushInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)){ + //只更新已读状态 + return pushInfoService.updatePushInfo(pushInfo); }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ return pushInfoService.deletePushInfo(pushInfo); }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ @@ -64,8 +67,8 @@ @PostMapping("/detail") @ResponseBody public Object detail(AppPushInfo pushInfo) { - AppPushInfo pushInfos = pushInfoService.pushInfoDetail(pushInfo); - return ResponseData.success(pushInfos); + AppPushInfo info = pushInfoService.pushInfoDetail(pushInfo); + return ResponseData.success(info); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java index 07e59e3..a7e6b26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java @@ -14,10 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + import java.util.Date; import java.util.Objects; @@ -82,4 +80,11 @@ } } + //根据用户id查用户信息 + @GetMapping("/info") + public Object info(String account) { + User user = this.userService.getByAccount(account); + return ResponseData.success(user); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java index 3f6784b..6546fdf 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.DistributorInfoListResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusDistributorInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,9 +23,22 @@ */ @RestController @RequestMapping("/distributorInfo") -public class BusDistributorInfoController { +public class BusDistributorInfoController extends ExportController { @Autowired private IBusDistributorInfoService distributorInfoService; + + /** + * 经销商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusDistributorInfo distributorInfo) { + List distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), distributorInfoList); + return ResponseData.success(super.packForBT(pages)); + } + /** * 经销商列表（不分页） */ @@ -74,9 +88,17 @@ @PostMapping("/business/detail") @ResponseBody public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) { - String distributorCode = distributorInfo.getDistributorCode(); BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo); return ResponseData.success(detailBusiness); } + /** + * 经销商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody DistributorInfoAddRequest distributorInfoAddRequest) { + return distributorInfoService.add(distributorInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java index 32d9e03..f3e306b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java @@ -50,6 +50,9 @@ public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody AppPushInfo pushInfo) { if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { return pushInfoService.addPushInfo(pushInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)){ + //只更新已读状态 + return pushInfoService.updatePushInfo(pushInfo); }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ return pushInfoService.deletePushInfo(pushInfo); }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ @@ -64,8 +67,8 @@ @PostMapping("/detail") @ResponseBody public Object detail(AppPushInfo pushInfo) { - AppPushInfo pushInfos = pushInfoService.pushInfoDetail(pushInfo); - return ResponseData.success(pushInfos); + AppPushInfo info = pushInfoService.pushInfoDetail(pushInfo); + return ResponseData.success(info); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java index 07e59e3..a7e6b26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java @@ -14,10 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + import java.util.Date; import java.util.Objects; @@ -82,4 +80,11 @@ } } + //根据用户id查用户信息 + @GetMapping("/info") + public Object info(String account) { + User user = this.userService.getByAccount(account); + return ResponseData.success(user); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java index 3f6784b..6546fdf 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.DistributorInfoListResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusDistributorInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,9 +23,22 @@ */ @RestController @RequestMapping("/distributorInfo") -public class BusDistributorInfoController { +public class BusDistributorInfoController extends ExportController { @Autowired private IBusDistributorInfoService distributorInfoService; + + /** + * 经销商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusDistributorInfo distributorInfo) { + List distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), distributorInfoList); + return ResponseData.success(super.packForBT(pages)); + } + /** * 经销商列表（不分页） */ @@ -74,9 +88,17 @@ @PostMapping("/business/detail") @ResponseBody public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) { - String distributorCode = distributorInfo.getDistributorCode(); BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo); return ResponseData.success(detailBusiness); } + /** + * 经销商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody DistributorInfoAddRequest distributorInfoAddRequest) { + return distributorInfoService.add(distributorInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java index fa64dab..a8c2d17 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess; +import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierAnnualAssess") -public class BusSupplierAnnualAssessController { +public class BusSupplierAnnualAssessController extends ExportController { @Autowired private IBusSupplierAnnualAssessService annualAssessService; /** + * 供应商年度考核列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) { + Page page = PageFactory.defaultPage(); + List annualAssessInfoList = annualAssessService.getAnnualAssessInfoList(annualAssess); + page.setRecords(annualAssessInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商年度考核列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java index 32d9e03..f3e306b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java @@ -50,6 +50,9 @@ public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody AppPushInfo pushInfo) { if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { return pushInfoService.addPushInfo(pushInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)){ + //只更新已读状态 + return pushInfoService.updatePushInfo(pushInfo); }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ return pushInfoService.deletePushInfo(pushInfo); }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ @@ -64,8 +67,8 @@ @PostMapping("/detail") @ResponseBody public Object detail(AppPushInfo pushInfo) { - AppPushInfo pushInfos = pushInfoService.pushInfoDetail(pushInfo); - return ResponseData.success(pushInfos); + AppPushInfo info = pushInfoService.pushInfoDetail(pushInfo); + return ResponseData.success(info); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java index 07e59e3..a7e6b26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java @@ -14,10 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + import java.util.Date; import java.util.Objects; @@ -82,4 +80,11 @@ } } + //根据用户id查用户信息 + @GetMapping("/info") + public Object info(String account) { + User user = this.userService.getByAccount(account); + return ResponseData.success(user); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java index 3f6784b..6546fdf 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.DistributorInfoListResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusDistributorInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,9 +23,22 @@ */ @RestController @RequestMapping("/distributorInfo") -public class BusDistributorInfoController { +public class BusDistributorInfoController extends ExportController { @Autowired private IBusDistributorInfoService distributorInfoService; + + /** + * 经销商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusDistributorInfo distributorInfo) { + List distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), distributorInfoList); + return ResponseData.success(super.packForBT(pages)); + } + /** * 经销商列表（不分页） */ @@ -74,9 +88,17 @@ @PostMapping("/business/detail") @ResponseBody public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) { - String distributorCode = distributorInfo.getDistributorCode(); BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo); return ResponseData.success(detailBusiness); } + /** + * 经销商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody DistributorInfoAddRequest distributorInfoAddRequest) { + return distributorInfoService.add(distributorInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java index fa64dab..a8c2d17 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess; +import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierAnnualAssess") -public class BusSupplierAnnualAssessController { +public class BusSupplierAnnualAssessController extends ExportController { @Autowired private IBusSupplierAnnualAssessService annualAssessService; /** + * 供应商年度考核列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) { + Page page = PageFactory.defaultPage(); + List annualAssessInfoList = annualAssessService.getAnnualAssessInfoList(annualAssess); + page.setRecords(annualAssessInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商年度考核列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java index dcfe4f3..7d8dbff 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java @@ -1,11 +1,16 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest; import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; import com.casic.missiles.modular.system.dto.SupplierInfoListResponse; import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusSupplierInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,11 +26,23 @@ */ @RestController @RequestMapping("/supplierInfo") -public class BusSupplierInfoController { +public class BusSupplierInfoController extends ExportController { @Autowired private IBusSupplierInfoService supplierInfoService; /** + * 供应商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInfo busSupplierInfo) { + List busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busSupplierInfos); + return ResponseData.success(super.packForBT(pages)); + } + + /** * 供应商列表（不分页） */ @PostMapping("/list") @@ -90,4 +107,13 @@ return ResponseData.success(reviewDetailResponse); } + /** + * 供应商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody SupplierInfoAddRequest supplierInfoAddRequest) { + return supplierInfoService.add(supplierInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java index 32d9e03..f3e306b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java @@ -50,6 +50,9 @@ public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody AppPushInfo pushInfo) { if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { return pushInfoService.addPushInfo(pushInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)){ + //只更新已读状态 + return pushInfoService.updatePushInfo(pushInfo); }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ return pushInfoService.deletePushInfo(pushInfo); }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ @@ -64,8 +67,8 @@ @PostMapping("/detail") @ResponseBody public Object detail(AppPushInfo pushInfo) { - AppPushInfo pushInfos = pushInfoService.pushInfoDetail(pushInfo); - return ResponseData.success(pushInfos); + AppPushInfo info = pushInfoService.pushInfoDetail(pushInfo); + return ResponseData.success(info); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java index 07e59e3..a7e6b26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java @@ -14,10 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + import java.util.Date; import java.util.Objects; @@ -82,4 +80,11 @@ } } + //根据用户id查用户信息 + @GetMapping("/info") + public Object info(String account) { + User user = this.userService.getByAccount(account); + return ResponseData.success(user); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java index 3f6784b..6546fdf 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.DistributorInfoListResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusDistributorInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,9 +23,22 @@ */ @RestController @RequestMapping("/distributorInfo") -public class BusDistributorInfoController { +public class BusDistributorInfoController extends ExportController { @Autowired private IBusDistributorInfoService distributorInfoService; + + /** + * 经销商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusDistributorInfo distributorInfo) { + List distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), distributorInfoList); + return ResponseData.success(super.packForBT(pages)); + } + /** * 经销商列表（不分页） */ @@ -74,9 +88,17 @@ @PostMapping("/business/detail") @ResponseBody public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) { - String distributorCode = distributorInfo.getDistributorCode(); BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo); return ResponseData.success(detailBusiness); } + /** + * 经销商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody DistributorInfoAddRequest distributorInfoAddRequest) { + return distributorInfoService.add(distributorInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java index fa64dab..a8c2d17 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess; +import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierAnnualAssess") -public class BusSupplierAnnualAssessController { +public class BusSupplierAnnualAssessController extends ExportController { @Autowired private IBusSupplierAnnualAssessService annualAssessService; /** + * 供应商年度考核列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) { + Page page = PageFactory.defaultPage(); + List annualAssessInfoList = annualAssessService.getAnnualAssessInfoList(annualAssess); + page.setRecords(annualAssessInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商年度考核列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java index dcfe4f3..7d8dbff 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java @@ -1,11 +1,16 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest; import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; import com.casic.missiles.modular.system.dto.SupplierInfoListResponse; import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusSupplierInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,11 +26,23 @@ */ @RestController @RequestMapping("/supplierInfo") -public class BusSupplierInfoController { +public class BusSupplierInfoController extends ExportController { @Autowired private IBusSupplierInfoService supplierInfoService; /** + * 供应商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInfo busSupplierInfo) { + List busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busSupplierInfos); + return ResponseData.success(super.packForBT(pages)); + } + + /** * 供应商列表（不分页） */ @PostMapping("/list") @@ -90,4 +107,13 @@ return ResponseData.success(reviewDetailResponse); } + /** + * 供应商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody SupplierInfoAddRequest supplierInfoAddRequest) { + return supplierInfoService.add(supplierInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java index e4f2a13..eba3dc0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; +import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierInputReview") -public class BusSupplierInputReviewController { +public class BusSupplierInputReviewController extends ExportController { @Autowired private IBusSupplierInputReviewService inputReviewService; /** + * 供应商资料录库评审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInputReview inputReview) { + Page page = PageFactory.defaultPage(); + List inputReviewInfoList = inputReviewService.getInputReviewInfoList(inputReview); + page.setRecords(inputReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商资料录库评审列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java index 32d9e03..f3e306b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java @@ -50,6 +50,9 @@ public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody AppPushInfo pushInfo) { if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { return pushInfoService.addPushInfo(pushInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)){ + //只更新已读状态 + return pushInfoService.updatePushInfo(pushInfo); }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ return pushInfoService.deletePushInfo(pushInfo); }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ @@ -64,8 +67,8 @@ @PostMapping("/detail") @ResponseBody public Object detail(AppPushInfo pushInfo) { - AppPushInfo pushInfos = pushInfoService.pushInfoDetail(pushInfo); - return ResponseData.success(pushInfos); + AppPushInfo info = pushInfoService.pushInfoDetail(pushInfo); + return ResponseData.success(info); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java index 07e59e3..a7e6b26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java @@ -14,10 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + import java.util.Date; import java.util.Objects; @@ -82,4 +80,11 @@ } } + //根据用户id查用户信息 + @GetMapping("/info") + public Object info(String account) { + User user = this.userService.getByAccount(account); + return ResponseData.success(user); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java index 3f6784b..6546fdf 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.DistributorInfoListResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusDistributorInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,9 +23,22 @@ */ @RestController @RequestMapping("/distributorInfo") -public class BusDistributorInfoController { +public class BusDistributorInfoController extends ExportController { @Autowired private IBusDistributorInfoService distributorInfoService; + + /** + * 经销商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusDistributorInfo distributorInfo) { + List distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), distributorInfoList); + return ResponseData.success(super.packForBT(pages)); + } + /** * 经销商列表（不分页） */ @@ -74,9 +88,17 @@ @PostMapping("/business/detail") @ResponseBody public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) { - String distributorCode = distributorInfo.getDistributorCode(); BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo); return ResponseData.success(detailBusiness); } + /** + * 经销商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody DistributorInfoAddRequest distributorInfoAddRequest) { + return distributorInfoService.add(distributorInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java index fa64dab..a8c2d17 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess; +import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierAnnualAssess") -public class BusSupplierAnnualAssessController { +public class BusSupplierAnnualAssessController extends ExportController { @Autowired private IBusSupplierAnnualAssessService annualAssessService; /** + * 供应商年度考核列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) { + Page page = PageFactory.defaultPage(); + List annualAssessInfoList = annualAssessService.getAnnualAssessInfoList(annualAssess); + page.setRecords(annualAssessInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商年度考核列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java index dcfe4f3..7d8dbff 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java @@ -1,11 +1,16 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest; import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; import com.casic.missiles.modular.system.dto.SupplierInfoListResponse; import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusSupplierInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,11 +26,23 @@ */ @RestController @RequestMapping("/supplierInfo") -public class BusSupplierInfoController { +public class BusSupplierInfoController extends ExportController { @Autowired private IBusSupplierInfoService supplierInfoService; /** + * 供应商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInfo busSupplierInfo) { + List busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busSupplierInfos); + return ResponseData.success(super.packForBT(pages)); + } + + /** * 供应商列表（不分页） */ @PostMapping("/list") @@ -90,4 +107,13 @@ return ResponseData.success(reviewDetailResponse); } + /** + * 供应商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody SupplierInfoAddRequest supplierInfoAddRequest) { + return supplierInfoService.add(supplierInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java index e4f2a13..eba3dc0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; +import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierInputReview") -public class BusSupplierInputReviewController { +public class BusSupplierInputReviewController extends ExportController { @Autowired private IBusSupplierInputReviewService inputReviewService; /** + * 供应商资料录库评审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInputReview inputReview) { + Page page = PageFactory.defaultPage(); + List inputReviewInfoList = inputReviewService.getInputReviewInfoList(inputReview); + page.setRecords(inputReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商资料录库评审列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java index a4e5d70..fa9572a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java @@ -1,6 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusSupplierInfo; import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,9 +24,20 @@ */ @RestController @RequestMapping("/supplierPreReview") -public class BusSupplierPreReviewController { +public class BusSupplierPreReviewController extends ExportController { @Autowired private IBusSupplierPreReviewService preReviewService; + /** + * 供应商资料预审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierPreReview preReview) { + Page page = PageFactory.defaultPage(); + List preReviewInfoList = preReviewService.getPreReviewInfoList(preReview); + page.setRecords(preReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } /** * 供应商资料预审列表（不分页） diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java index 32d9e03..f3e306b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java @@ -50,6 +50,9 @@ public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody AppPushInfo pushInfo) { if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { return pushInfoService.addPushInfo(pushInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)){ + //只更新已读状态 + return pushInfoService.updatePushInfo(pushInfo); }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ return pushInfoService.deletePushInfo(pushInfo); }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ @@ -64,8 +67,8 @@ @PostMapping("/detail") @ResponseBody public Object detail(AppPushInfo pushInfo) { - AppPushInfo pushInfos = pushInfoService.pushInfoDetail(pushInfo); - return ResponseData.success(pushInfos); + AppPushInfo info = pushInfoService.pushInfoDetail(pushInfo); + return ResponseData.success(info); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java index 07e59e3..a7e6b26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java @@ -14,10 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + import java.util.Date; import java.util.Objects; @@ -82,4 +80,11 @@ } } + //根据用户id查用户信息 + @GetMapping("/info") + public Object info(String account) { + User user = this.userService.getByAccount(account); + return ResponseData.success(user); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java index 3f6784b..6546fdf 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.DistributorInfoListResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusDistributorInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,9 +23,22 @@ */ @RestController @RequestMapping("/distributorInfo") -public class BusDistributorInfoController { +public class BusDistributorInfoController extends ExportController { @Autowired private IBusDistributorInfoService distributorInfoService; + + /** + * 经销商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusDistributorInfo distributorInfo) { + List distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), distributorInfoList); + return ResponseData.success(super.packForBT(pages)); + } + /** * 经销商列表（不分页） */ @@ -74,9 +88,17 @@ @PostMapping("/business/detail") @ResponseBody public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) { - String distributorCode = distributorInfo.getDistributorCode(); BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo); return ResponseData.success(detailBusiness); } + /** + * 经销商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody DistributorInfoAddRequest distributorInfoAddRequest) { + return distributorInfoService.add(distributorInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java index fa64dab..a8c2d17 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess; +import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierAnnualAssess") -public class BusSupplierAnnualAssessController { +public class BusSupplierAnnualAssessController extends ExportController { @Autowired private IBusSupplierAnnualAssessService annualAssessService; /** + * 供应商年度考核列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) { + Page page = PageFactory.defaultPage(); + List annualAssessInfoList = annualAssessService.getAnnualAssessInfoList(annualAssess); + page.setRecords(annualAssessInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商年度考核列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java index dcfe4f3..7d8dbff 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java @@ -1,11 +1,16 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest; import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; import com.casic.missiles.modular.system.dto.SupplierInfoListResponse; import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusSupplierInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,11 +26,23 @@ */ @RestController @RequestMapping("/supplierInfo") -public class BusSupplierInfoController { +public class BusSupplierInfoController extends ExportController { @Autowired private IBusSupplierInfoService supplierInfoService; /** + * 供应商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInfo busSupplierInfo) { + List busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busSupplierInfos); + return ResponseData.success(super.packForBT(pages)); + } + + /** * 供应商列表（不分页） */ @PostMapping("/list") @@ -90,4 +107,13 @@ return ResponseData.success(reviewDetailResponse); } + /** + * 供应商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody SupplierInfoAddRequest supplierInfoAddRequest) { + return supplierInfoService.add(supplierInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java index e4f2a13..eba3dc0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; +import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierInputReview") -public class BusSupplierInputReviewController { +public class BusSupplierInputReviewController extends ExportController { @Autowired private IBusSupplierInputReviewService inputReviewService; /** + * 供应商资料录库评审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInputReview inputReview) { + Page page = PageFactory.defaultPage(); + List inputReviewInfoList = inputReviewService.getInputReviewInfoList(inputReview); + page.setRecords(inputReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商资料录库评审列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java index a4e5d70..fa9572a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java @@ -1,6 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusSupplierInfo; import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,9 +24,20 @@ */ @RestController @RequestMapping("/supplierPreReview") -public class BusSupplierPreReviewController { +public class BusSupplierPreReviewController extends ExportController { @Autowired private IBusSupplierPreReviewService preReviewService; + /** + * 供应商资料预审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierPreReview preReview) { + Page page = PageFactory.defaultPage(); + List preReviewInfoList = preReviewService.getPreReviewInfoList(preReview); + page.setRecords(preReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } /** * 供应商资料预审列表（不分页） diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java index 6cbfe1e..278ab5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java @@ -1,5 +1,8 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate; @@ -22,11 +25,23 @@ */ @RestController @RequestMapping("/supplierQuarterlyEvaluate") -public class BusSupplierQuarterlyEvaluateController { +public class BusSupplierQuarterlyEvaluateController extends ExportController { @Autowired private IBusSupplierQuarterlyEvaluateService quarterlyEvaluateService; /** + * 供应商季度评价列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) { + Page page = PageFactory.defaultPage(); + List quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoList(quarterlyEvaluate); + page.setRecords(quarterlyEvaluateList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商季度评价列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java index 32d9e03..f3e306b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java @@ -50,6 +50,9 @@ public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody AppPushInfo pushInfo) { if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { return pushInfoService.addPushInfo(pushInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)){ + //只更新已读状态 + return pushInfoService.updatePushInfo(pushInfo); }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ return pushInfoService.deletePushInfo(pushInfo); }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ @@ -64,8 +67,8 @@ @PostMapping("/detail") @ResponseBody public Object detail(AppPushInfo pushInfo) { - AppPushInfo pushInfos = pushInfoService.pushInfoDetail(pushInfo); - return ResponseData.success(pushInfos); + AppPushInfo info = pushInfoService.pushInfoDetail(pushInfo); + return ResponseData.success(info); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java index 07e59e3..a7e6b26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java @@ -14,10 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + import java.util.Date; import java.util.Objects; @@ -82,4 +80,11 @@ } } + //根据用户id查用户信息 + @GetMapping("/info") + public Object info(String account) { + User user = this.userService.getByAccount(account); + return ResponseData.success(user); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java index 3f6784b..6546fdf 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.DistributorInfoListResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusDistributorInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,9 +23,22 @@ */ @RestController @RequestMapping("/distributorInfo") -public class BusDistributorInfoController { +public class BusDistributorInfoController extends ExportController { @Autowired private IBusDistributorInfoService distributorInfoService; + + /** + * 经销商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusDistributorInfo distributorInfo) { + List distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), distributorInfoList); + return ResponseData.success(super.packForBT(pages)); + } + /** * 经销商列表（不分页） */ @@ -74,9 +88,17 @@ @PostMapping("/business/detail") @ResponseBody public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) { - String distributorCode = distributorInfo.getDistributorCode(); BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo); return ResponseData.success(detailBusiness); } + /** + * 经销商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody DistributorInfoAddRequest distributorInfoAddRequest) { + return distributorInfoService.add(distributorInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java index fa64dab..a8c2d17 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess; +import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierAnnualAssess") -public class BusSupplierAnnualAssessController { +public class BusSupplierAnnualAssessController extends ExportController { @Autowired private IBusSupplierAnnualAssessService annualAssessService; /** + * 供应商年度考核列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) { + Page page = PageFactory.defaultPage(); + List annualAssessInfoList = annualAssessService.getAnnualAssessInfoList(annualAssess); + page.setRecords(annualAssessInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商年度考核列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java index dcfe4f3..7d8dbff 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java @@ -1,11 +1,16 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest; import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; import com.casic.missiles.modular.system.dto.SupplierInfoListResponse; import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusSupplierInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,11 +26,23 @@ */ @RestController @RequestMapping("/supplierInfo") -public class BusSupplierInfoController { +public class BusSupplierInfoController extends ExportController { @Autowired private IBusSupplierInfoService supplierInfoService; /** + * 供应商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInfo busSupplierInfo) { + List busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busSupplierInfos); + return ResponseData.success(super.packForBT(pages)); + } + + /** * 供应商列表（不分页） */ @PostMapping("/list") @@ -90,4 +107,13 @@ return ResponseData.success(reviewDetailResponse); } + /** + * 供应商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody SupplierInfoAddRequest supplierInfoAddRequest) { + return supplierInfoService.add(supplierInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java index e4f2a13..eba3dc0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; +import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierInputReview") -public class BusSupplierInputReviewController { +public class BusSupplierInputReviewController extends ExportController { @Autowired private IBusSupplierInputReviewService inputReviewService; /** + * 供应商资料录库评审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInputReview inputReview) { + Page page = PageFactory.defaultPage(); + List inputReviewInfoList = inputReviewService.getInputReviewInfoList(inputReview); + page.setRecords(inputReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商资料录库评审列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java index a4e5d70..fa9572a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java @@ -1,6 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusSupplierInfo; import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,9 +24,20 @@ */ @RestController @RequestMapping("/supplierPreReview") -public class BusSupplierPreReviewController { +public class BusSupplierPreReviewController extends ExportController { @Autowired private IBusSupplierPreReviewService preReviewService; + /** + * 供应商资料预审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierPreReview preReview) { + Page page = PageFactory.defaultPage(); + List preReviewInfoList = preReviewService.getPreReviewInfoList(preReview); + page.setRecords(preReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } /** * 供应商资料预审列表（不分页） diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java index 6cbfe1e..278ab5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java @@ -1,5 +1,8 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate; @@ -22,11 +25,23 @@ */ @RestController @RequestMapping("/supplierQuarterlyEvaluate") -public class BusSupplierQuarterlyEvaluateController { +public class BusSupplierQuarterlyEvaluateController extends ExportController { @Autowired private IBusSupplierQuarterlyEvaluateService quarterlyEvaluateService; /** + * 供应商季度评价列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) { + Page page = PageFactory.defaultPage(); + List quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoList(quarterlyEvaluate); + page.setRecords(quarterlyEvaluateList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商季度评价列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java index 3ece5df..61bf830 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java @@ -1,16 +1,19 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.codec.Base64; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; import com.casic.missiles.model.application.event.core.EventPublisher; import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.event.UserEvent; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.modular.system.redis.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.text.MessageFormat; /** * @ClassName DemoController @@ -24,6 +27,9 @@ @Autowired private EventPublisher publisher; + @Autowired + private RedisUtil redisUtil; + /** * 获取mockToken */ @@ -36,5 +42,29 @@ return ResponseData.success(); } +// /** +// * 燃气压力项目接收数据测试（拓普瑞平台） +// */ +// @PostMapping("/recv") +// @ResponseBody +// public Object recv(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("pressure:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb"); +// System.out.println(encode); +// return ResponseData.success(); +// } +// +// /** +// * 燃气压力项目接收数据测试（电信平台） +// */ +// @PostMapping("/recv2") +// @ResponseBody +// public Object recv2(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("aep:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// return ResponseData.success(); +// } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java index 32d9e03..f3e306b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java @@ -50,6 +50,9 @@ public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody AppPushInfo pushInfo) { if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { return pushInfoService.addPushInfo(pushInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)){ + //只更新已读状态 + return pushInfoService.updatePushInfo(pushInfo); }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ return pushInfoService.deletePushInfo(pushInfo); }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ @@ -64,8 +67,8 @@ @PostMapping("/detail") @ResponseBody public Object detail(AppPushInfo pushInfo) { - AppPushInfo pushInfos = pushInfoService.pushInfoDetail(pushInfo); - return ResponseData.success(pushInfos); + AppPushInfo info = pushInfoService.pushInfoDetail(pushInfo); + return ResponseData.success(info); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java index 07e59e3..a7e6b26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java @@ -14,10 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + import java.util.Date; import java.util.Objects; @@ -82,4 +80,11 @@ } } + //根据用户id查用户信息 + @GetMapping("/info") + public Object info(String account) { + User user = this.userService.getByAccount(account); + return ResponseData.success(user); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java index 3f6784b..6546fdf 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.DistributorInfoListResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusDistributorInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,9 +23,22 @@ */ @RestController @RequestMapping("/distributorInfo") -public class BusDistributorInfoController { +public class BusDistributorInfoController extends ExportController { @Autowired private IBusDistributorInfoService distributorInfoService; + + /** + * 经销商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusDistributorInfo distributorInfo) { + List distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), distributorInfoList); + return ResponseData.success(super.packForBT(pages)); + } + /** * 经销商列表（不分页） */ @@ -74,9 +88,17 @@ @PostMapping("/business/detail") @ResponseBody public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) { - String distributorCode = distributorInfo.getDistributorCode(); BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo); return ResponseData.success(detailBusiness); } + /** + * 经销商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody DistributorInfoAddRequest distributorInfoAddRequest) { + return distributorInfoService.add(distributorInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java index fa64dab..a8c2d17 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess; +import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierAnnualAssess") -public class BusSupplierAnnualAssessController { +public class BusSupplierAnnualAssessController extends ExportController { @Autowired private IBusSupplierAnnualAssessService annualAssessService; /** + * 供应商年度考核列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) { + Page page = PageFactory.defaultPage(); + List annualAssessInfoList = annualAssessService.getAnnualAssessInfoList(annualAssess); + page.setRecords(annualAssessInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商年度考核列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java index dcfe4f3..7d8dbff 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java @@ -1,11 +1,16 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest; import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; import com.casic.missiles.modular.system.dto.SupplierInfoListResponse; import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusSupplierInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,11 +26,23 @@ */ @RestController @RequestMapping("/supplierInfo") -public class BusSupplierInfoController { +public class BusSupplierInfoController extends ExportController { @Autowired private IBusSupplierInfoService supplierInfoService; /** + * 供应商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInfo busSupplierInfo) { + List busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busSupplierInfos); + return ResponseData.success(super.packForBT(pages)); + } + + /** * 供应商列表（不分页） */ @PostMapping("/list") @@ -90,4 +107,13 @@ return ResponseData.success(reviewDetailResponse); } + /** + * 供应商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody SupplierInfoAddRequest supplierInfoAddRequest) { + return supplierInfoService.add(supplierInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java index e4f2a13..eba3dc0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; +import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierInputReview") -public class BusSupplierInputReviewController { +public class BusSupplierInputReviewController extends ExportController { @Autowired private IBusSupplierInputReviewService inputReviewService; /** + * 供应商资料录库评审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInputReview inputReview) { + Page page = PageFactory.defaultPage(); + List inputReviewInfoList = inputReviewService.getInputReviewInfoList(inputReview); + page.setRecords(inputReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商资料录库评审列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java index a4e5d70..fa9572a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java @@ -1,6 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusSupplierInfo; import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,9 +24,20 @@ */ @RestController @RequestMapping("/supplierPreReview") -public class BusSupplierPreReviewController { +public class BusSupplierPreReviewController extends ExportController { @Autowired private IBusSupplierPreReviewService preReviewService; + /** + * 供应商资料预审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierPreReview preReview) { + Page page = PageFactory.defaultPage(); + List preReviewInfoList = preReviewService.getPreReviewInfoList(preReview); + page.setRecords(preReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } /** * 供应商资料预审列表（不分页） diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java index 6cbfe1e..278ab5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java @@ -1,5 +1,8 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate; @@ -22,11 +25,23 @@ */ @RestController @RequestMapping("/supplierQuarterlyEvaluate") -public class BusSupplierQuarterlyEvaluateController { +public class BusSupplierQuarterlyEvaluateController extends ExportController { @Autowired private IBusSupplierQuarterlyEvaluateService quarterlyEvaluateService; /** + * 供应商季度评价列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) { + Page page = PageFactory.defaultPage(); + List quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoList(quarterlyEvaluate); + page.setRecords(quarterlyEvaluateList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商季度评价列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java index 3ece5df..61bf830 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java @@ -1,16 +1,19 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.codec.Base64; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; import com.casic.missiles.model.application.event.core.EventPublisher; import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.event.UserEvent; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.modular.system.redis.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.text.MessageFormat; /** * @ClassName DemoController @@ -24,6 +27,9 @@ @Autowired private EventPublisher publisher; + @Autowired + private RedisUtil redisUtil; + /** * 获取mockToken */ @@ -36,5 +42,29 @@ return ResponseData.success(); } +// /** +// * 燃气压力项目接收数据测试（拓普瑞平台） +// */ +// @PostMapping("/recv") +// @ResponseBody +// public Object recv(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("pressure:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb"); +// System.out.println(encode); +// return ResponseData.success(); +// } +// +// /** +// * 燃气压力项目接收数据测试（电信平台） +// */ +// @PostMapping("/recv2") +// @ResponseBody +// public Object recv2(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("aep:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// return ResponseData.success(); +// } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java index 1eed88c..38a1326 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java @@ -1,23 +1,66 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SnInfoOperateRequest; +import com.casic.missiles.modular.system.enums.OperateTypeEnum; +import com.casic.missiles.modular.system.model.BusQualifyInfo; +import com.casic.missiles.modular.system.service.IBusQualifyInfoService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** - * @Description: 系统配置 + * @Description: 系统配置，资质要求增删查改 * @Author: wangpeng * @Date: 2022/9/26 15:43 */ @RestController @RequestMapping("/sys") -public class SysConfigController { +public class SysConfigController extends ExportController { + @Autowired + private IBusQualifyInfoService qualifyInfoService; /** - * 资质要求 + * 资质要求列表（分页） */ - @PostMapping("/qualify") + @PostMapping("/qualify/listPage") @ResponseBody - public Object list() { - // TODO: 2022/9/26 资质要求增删查改 + public Object listPage(@RequestBody BusQualifyInfo busQualifyInfo) { + Page page = PageFactory.defaultPage(); + List qualifyInfos = qualifyInfoService.getQualifyListPage(page, busQualifyInfo); + page.setRecords(qualifyInfos); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 资质要求列表（不分页） + */ + @PostMapping("/qualify/list") + @ResponseBody + public Object list(@RequestBody BusQualifyInfo busQualifyInfo) { + List qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo); + return ResponseData.success(qualifyInfos); + } + + /** + * 资质要求增删查改 + */ + @PostMapping("/qualify/{operation}") + @ResponseBody + public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody BusQualifyInfo busQualifyInfo) { + if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { + return qualifyInfoService.addQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)) { + return qualifyInfoService.updateQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteBatchQualifyInfo(busQualifyInfo.getIds()); + } return null; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java index 32d9e03..f3e306b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java @@ -50,6 +50,9 @@ public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody AppPushInfo pushInfo) { if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { return pushInfoService.addPushInfo(pushInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)){ + //只更新已读状态 + return pushInfoService.updatePushInfo(pushInfo); }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ return pushInfoService.deletePushInfo(pushInfo); }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ @@ -64,8 +67,8 @@ @PostMapping("/detail") @ResponseBody public Object detail(AppPushInfo pushInfo) { - AppPushInfo pushInfos = pushInfoService.pushInfoDetail(pushInfo); - return ResponseData.success(pushInfos); + AppPushInfo info = pushInfoService.pushInfoDetail(pushInfo); + return ResponseData.success(info); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java index 07e59e3..a7e6b26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java @@ -14,10 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + import java.util.Date; import java.util.Objects; @@ -82,4 +80,11 @@ } } + //根据用户id查用户信息 + @GetMapping("/info") + public Object info(String account) { + User user = this.userService.getByAccount(account); + return ResponseData.success(user); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java index 3f6784b..6546fdf 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.DistributorInfoListResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusDistributorInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,9 +23,22 @@ */ @RestController @RequestMapping("/distributorInfo") -public class BusDistributorInfoController { +public class BusDistributorInfoController extends ExportController { @Autowired private IBusDistributorInfoService distributorInfoService; + + /** + * 经销商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusDistributorInfo distributorInfo) { + List distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), distributorInfoList); + return ResponseData.success(super.packForBT(pages)); + } + /** * 经销商列表（不分页） */ @@ -74,9 +88,17 @@ @PostMapping("/business/detail") @ResponseBody public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) { - String distributorCode = distributorInfo.getDistributorCode(); BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo); return ResponseData.success(detailBusiness); } + /** + * 经销商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody DistributorInfoAddRequest distributorInfoAddRequest) { + return distributorInfoService.add(distributorInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java index fa64dab..a8c2d17 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess; +import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierAnnualAssess") -public class BusSupplierAnnualAssessController { +public class BusSupplierAnnualAssessController extends ExportController { @Autowired private IBusSupplierAnnualAssessService annualAssessService; /** + * 供应商年度考核列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) { + Page page = PageFactory.defaultPage(); + List annualAssessInfoList = annualAssessService.getAnnualAssessInfoList(annualAssess); + page.setRecords(annualAssessInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商年度考核列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java index dcfe4f3..7d8dbff 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java @@ -1,11 +1,16 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest; import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; import com.casic.missiles.modular.system.dto.SupplierInfoListResponse; import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusSupplierInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,11 +26,23 @@ */ @RestController @RequestMapping("/supplierInfo") -public class BusSupplierInfoController { +public class BusSupplierInfoController extends ExportController { @Autowired private IBusSupplierInfoService supplierInfoService; /** + * 供应商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInfo busSupplierInfo) { + List busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busSupplierInfos); + return ResponseData.success(super.packForBT(pages)); + } + + /** * 供应商列表（不分页） */ @PostMapping("/list") @@ -90,4 +107,13 @@ return ResponseData.success(reviewDetailResponse); } + /** + * 供应商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody SupplierInfoAddRequest supplierInfoAddRequest) { + return supplierInfoService.add(supplierInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java index e4f2a13..eba3dc0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; +import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierInputReview") -public class BusSupplierInputReviewController { +public class BusSupplierInputReviewController extends ExportController { @Autowired private IBusSupplierInputReviewService inputReviewService; /** + * 供应商资料录库评审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInputReview inputReview) { + Page page = PageFactory.defaultPage(); + List inputReviewInfoList = inputReviewService.getInputReviewInfoList(inputReview); + page.setRecords(inputReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商资料录库评审列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java index a4e5d70..fa9572a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java @@ -1,6 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusSupplierInfo; import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,9 +24,20 @@ */ @RestController @RequestMapping("/supplierPreReview") -public class BusSupplierPreReviewController { +public class BusSupplierPreReviewController extends ExportController { @Autowired private IBusSupplierPreReviewService preReviewService; + /** + * 供应商资料预审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierPreReview preReview) { + Page page = PageFactory.defaultPage(); + List preReviewInfoList = preReviewService.getPreReviewInfoList(preReview); + page.setRecords(preReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } /** * 供应商资料预审列表（不分页） diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java index 6cbfe1e..278ab5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java @@ -1,5 +1,8 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate; @@ -22,11 +25,23 @@ */ @RestController @RequestMapping("/supplierQuarterlyEvaluate") -public class BusSupplierQuarterlyEvaluateController { +public class BusSupplierQuarterlyEvaluateController extends ExportController { @Autowired private IBusSupplierQuarterlyEvaluateService quarterlyEvaluateService; /** + * 供应商季度评价列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) { + Page page = PageFactory.defaultPage(); + List quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoList(quarterlyEvaluate); + page.setRecords(quarterlyEvaluateList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商季度评价列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java index 3ece5df..61bf830 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java @@ -1,16 +1,19 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.codec.Base64; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; import com.casic.missiles.model.application.event.core.EventPublisher; import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.event.UserEvent; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.modular.system.redis.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.text.MessageFormat; /** * @ClassName DemoController @@ -24,6 +27,9 @@ @Autowired private EventPublisher publisher; + @Autowired + private RedisUtil redisUtil; + /** * 获取mockToken */ @@ -36,5 +42,29 @@ return ResponseData.success(); } +// /** +// * 燃气压力项目接收数据测试（拓普瑞平台） +// */ +// @PostMapping("/recv") +// @ResponseBody +// public Object recv(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("pressure:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb"); +// System.out.println(encode); +// return ResponseData.success(); +// } +// +// /** +// * 燃气压力项目接收数据测试（电信平台） +// */ +// @PostMapping("/recv2") +// @ResponseBody +// public Object recv2(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("aep:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// return ResponseData.success(); +// } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java index 1eed88c..38a1326 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java @@ -1,23 +1,66 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SnInfoOperateRequest; +import com.casic.missiles.modular.system.enums.OperateTypeEnum; +import com.casic.missiles.modular.system.model.BusQualifyInfo; +import com.casic.missiles.modular.system.service.IBusQualifyInfoService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** - * @Description: 系统配置 + * @Description: 系统配置，资质要求增删查改 * @Author: wangpeng * @Date: 2022/9/26 15:43 */ @RestController @RequestMapping("/sys") -public class SysConfigController { +public class SysConfigController extends ExportController { + @Autowired + private IBusQualifyInfoService qualifyInfoService; /** - * 资质要求 + * 资质要求列表（分页） */ - @PostMapping("/qualify") + @PostMapping("/qualify/listPage") @ResponseBody - public Object list() { - // TODO: 2022/9/26 资质要求增删查改 + public Object listPage(@RequestBody BusQualifyInfo busQualifyInfo) { + Page page = PageFactory.defaultPage(); + List qualifyInfos = qualifyInfoService.getQualifyListPage(page, busQualifyInfo); + page.setRecords(qualifyInfos); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 资质要求列表（不分页） + */ + @PostMapping("/qualify/list") + @ResponseBody + public Object list(@RequestBody BusQualifyInfo busQualifyInfo) { + List qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo); + return ResponseData.success(qualifyInfos); + } + + /** + * 资质要求增删查改 + */ + @PostMapping("/qualify/{operation}") + @ResponseBody + public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody BusQualifyInfo busQualifyInfo) { + if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { + return qualifyInfoService.addQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)) { + return qualifyInfoService.updateQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteBatchQualifyInfo(busQualifyInfo.getIds()); + } return null; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 806de2b..5d9f6d9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -44,10 +44,9 @@ @Autowired private SMSUtil smsUtil; -// @Autowired -// private AbstractUserService userService; - - + /** + * 发送短信验证码 + */ @PostMapping("/sms/send/{phone}") public ResponseData sendMsg(@PathVariable(name = "phone") String phone) { String key = MessageFormat.format(CacheKeys.SMS_TIMEOUT, phone); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java index 32d9e03..f3e306b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java @@ -50,6 +50,9 @@ public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody AppPushInfo pushInfo) { if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { return pushInfoService.addPushInfo(pushInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)){ + //只更新已读状态 + return pushInfoService.updatePushInfo(pushInfo); }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ return pushInfoService.deletePushInfo(pushInfo); }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ @@ -64,8 +67,8 @@ @PostMapping("/detail") @ResponseBody public Object detail(AppPushInfo pushInfo) { - AppPushInfo pushInfos = pushInfoService.pushInfoDetail(pushInfo); - return ResponseData.success(pushInfos); + AppPushInfo info = pushInfoService.pushInfoDetail(pushInfo); + return ResponseData.success(info); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java index 07e59e3..a7e6b26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java @@ -14,10 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + import java.util.Date; import java.util.Objects; @@ -82,4 +80,11 @@ } } + //根据用户id查用户信息 + @GetMapping("/info") + public Object info(String account) { + User user = this.userService.getByAccount(account); + return ResponseData.success(user); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java index 3f6784b..6546fdf 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.DistributorInfoListResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusDistributorInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,9 +23,22 @@ */ @RestController @RequestMapping("/distributorInfo") -public class BusDistributorInfoController { +public class BusDistributorInfoController extends ExportController { @Autowired private IBusDistributorInfoService distributorInfoService; + + /** + * 经销商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusDistributorInfo distributorInfo) { + List distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), distributorInfoList); + return ResponseData.success(super.packForBT(pages)); + } + /** * 经销商列表（不分页） */ @@ -74,9 +88,17 @@ @PostMapping("/business/detail") @ResponseBody public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) { - String distributorCode = distributorInfo.getDistributorCode(); BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo); return ResponseData.success(detailBusiness); } + /** + * 经销商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody DistributorInfoAddRequest distributorInfoAddRequest) { + return distributorInfoService.add(distributorInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java index fa64dab..a8c2d17 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess; +import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierAnnualAssess") -public class BusSupplierAnnualAssessController { +public class BusSupplierAnnualAssessController extends ExportController { @Autowired private IBusSupplierAnnualAssessService annualAssessService; /** + * 供应商年度考核列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) { + Page page = PageFactory.defaultPage(); + List annualAssessInfoList = annualAssessService.getAnnualAssessInfoList(annualAssess); + page.setRecords(annualAssessInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商年度考核列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java index dcfe4f3..7d8dbff 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java @@ -1,11 +1,16 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest; import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; import com.casic.missiles.modular.system.dto.SupplierInfoListResponse; import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusSupplierInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,11 +26,23 @@ */ @RestController @RequestMapping("/supplierInfo") -public class BusSupplierInfoController { +public class BusSupplierInfoController extends ExportController { @Autowired private IBusSupplierInfoService supplierInfoService; /** + * 供应商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInfo busSupplierInfo) { + List busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busSupplierInfos); + return ResponseData.success(super.packForBT(pages)); + } + + /** * 供应商列表（不分页） */ @PostMapping("/list") @@ -90,4 +107,13 @@ return ResponseData.success(reviewDetailResponse); } + /** + * 供应商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody SupplierInfoAddRequest supplierInfoAddRequest) { + return supplierInfoService.add(supplierInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java index e4f2a13..eba3dc0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; +import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierInputReview") -public class BusSupplierInputReviewController { +public class BusSupplierInputReviewController extends ExportController { @Autowired private IBusSupplierInputReviewService inputReviewService; /** + * 供应商资料录库评审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInputReview inputReview) { + Page page = PageFactory.defaultPage(); + List inputReviewInfoList = inputReviewService.getInputReviewInfoList(inputReview); + page.setRecords(inputReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商资料录库评审列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java index a4e5d70..fa9572a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java @@ -1,6 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusSupplierInfo; import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,9 +24,20 @@ */ @RestController @RequestMapping("/supplierPreReview") -public class BusSupplierPreReviewController { +public class BusSupplierPreReviewController extends ExportController { @Autowired private IBusSupplierPreReviewService preReviewService; + /** + * 供应商资料预审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierPreReview preReview) { + Page page = PageFactory.defaultPage(); + List preReviewInfoList = preReviewService.getPreReviewInfoList(preReview); + page.setRecords(preReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } /** * 供应商资料预审列表（不分页） diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java index 6cbfe1e..278ab5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java @@ -1,5 +1,8 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate; @@ -22,11 +25,23 @@ */ @RestController @RequestMapping("/supplierQuarterlyEvaluate") -public class BusSupplierQuarterlyEvaluateController { +public class BusSupplierQuarterlyEvaluateController extends ExportController { @Autowired private IBusSupplierQuarterlyEvaluateService quarterlyEvaluateService; /** + * 供应商季度评价列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) { + Page page = PageFactory.defaultPage(); + List quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoList(quarterlyEvaluate); + page.setRecords(quarterlyEvaluateList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商季度评价列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java index 3ece5df..61bf830 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java @@ -1,16 +1,19 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.codec.Base64; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; import com.casic.missiles.model.application.event.core.EventPublisher; import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.event.UserEvent; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.modular.system.redis.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.text.MessageFormat; /** * @ClassName DemoController @@ -24,6 +27,9 @@ @Autowired private EventPublisher publisher; + @Autowired + private RedisUtil redisUtil; + /** * 获取mockToken */ @@ -36,5 +42,29 @@ return ResponseData.success(); } +// /** +// * 燃气压力项目接收数据测试（拓普瑞平台） +// */ +// @PostMapping("/recv") +// @ResponseBody +// public Object recv(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("pressure:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb"); +// System.out.println(encode); +// return ResponseData.success(); +// } +// +// /** +// * 燃气压力项目接收数据测试（电信平台） +// */ +// @PostMapping("/recv2") +// @ResponseBody +// public Object recv2(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("aep:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// return ResponseData.success(); +// } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java index 1eed88c..38a1326 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java @@ -1,23 +1,66 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SnInfoOperateRequest; +import com.casic.missiles.modular.system.enums.OperateTypeEnum; +import com.casic.missiles.modular.system.model.BusQualifyInfo; +import com.casic.missiles.modular.system.service.IBusQualifyInfoService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** - * @Description: 系统配置 + * @Description: 系统配置，资质要求增删查改 * @Author: wangpeng * @Date: 2022/9/26 15:43 */ @RestController @RequestMapping("/sys") -public class SysConfigController { +public class SysConfigController extends ExportController { + @Autowired + private IBusQualifyInfoService qualifyInfoService; /** - * 资质要求 + * 资质要求列表（分页） */ - @PostMapping("/qualify") + @PostMapping("/qualify/listPage") @ResponseBody - public Object list() { - // TODO: 2022/9/26 资质要求增删查改 + public Object listPage(@RequestBody BusQualifyInfo busQualifyInfo) { + Page page = PageFactory.defaultPage(); + List qualifyInfos = qualifyInfoService.getQualifyListPage(page, busQualifyInfo); + page.setRecords(qualifyInfos); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 资质要求列表（不分页） + */ + @PostMapping("/qualify/list") + @ResponseBody + public Object list(@RequestBody BusQualifyInfo busQualifyInfo) { + List qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo); + return ResponseData.success(qualifyInfos); + } + + /** + * 资质要求增删查改 + */ + @PostMapping("/qualify/{operation}") + @ResponseBody + public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody BusQualifyInfo busQualifyInfo) { + if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { + return qualifyInfoService.addQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)) { + return qualifyInfoService.updateQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteBatchQualifyInfo(busQualifyInfo.getIds()); + } return null; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 806de2b..5d9f6d9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -44,10 +44,9 @@ @Autowired private SMSUtil smsUtil; -// @Autowired -// private AbstractUserService userService; - - + /** + * 发送短信验证码 + */ @PostMapping("/sms/send/{phone}") public ResponseData sendMsg(@PathVariable(name = "phone") String phone) { String key = MessageFormat.format(CacheKeys.SMS_TIMEOUT, phone); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java index 248e33e..8285662 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java @@ -18,4 +18,6 @@ public interface AppPushInfoMapper extends BaseMapper { List selectPushInfoList(@Param("page") Page page, @Param("pushInfo") AppPushInfo pushInfo); + + int updateStatusById(@Param("pushInfo") AppPushInfo pushInfo); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java index 32d9e03..f3e306b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java @@ -50,6 +50,9 @@ public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody AppPushInfo pushInfo) { if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { return pushInfoService.addPushInfo(pushInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)){ + //只更新已读状态 + return pushInfoService.updatePushInfo(pushInfo); }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ return pushInfoService.deletePushInfo(pushInfo); }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ @@ -64,8 +67,8 @@ @PostMapping("/detail") @ResponseBody public Object detail(AppPushInfo pushInfo) { - AppPushInfo pushInfos = pushInfoService.pushInfoDetail(pushInfo); - return ResponseData.success(pushInfos); + AppPushInfo info = pushInfoService.pushInfoDetail(pushInfo); + return ResponseData.success(info); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java index 07e59e3..a7e6b26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java @@ -14,10 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + import java.util.Date; import java.util.Objects; @@ -82,4 +80,11 @@ } } + //根据用户id查用户信息 + @GetMapping("/info") + public Object info(String account) { + User user = this.userService.getByAccount(account); + return ResponseData.success(user); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java index 3f6784b..6546fdf 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.DistributorInfoListResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusDistributorInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,9 +23,22 @@ */ @RestController @RequestMapping("/distributorInfo") -public class BusDistributorInfoController { +public class BusDistributorInfoController extends ExportController { @Autowired private IBusDistributorInfoService distributorInfoService; + + /** + * 经销商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusDistributorInfo distributorInfo) { + List distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), distributorInfoList); + return ResponseData.success(super.packForBT(pages)); + } + /** * 经销商列表（不分页） */ @@ -74,9 +88,17 @@ @PostMapping("/business/detail") @ResponseBody public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) { - String distributorCode = distributorInfo.getDistributorCode(); BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo); return ResponseData.success(detailBusiness); } + /** + * 经销商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody DistributorInfoAddRequest distributorInfoAddRequest) { + return distributorInfoService.add(distributorInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java index fa64dab..a8c2d17 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess; +import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierAnnualAssess") -public class BusSupplierAnnualAssessController { +public class BusSupplierAnnualAssessController extends ExportController { @Autowired private IBusSupplierAnnualAssessService annualAssessService; /** + * 供应商年度考核列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) { + Page page = PageFactory.defaultPage(); + List annualAssessInfoList = annualAssessService.getAnnualAssessInfoList(annualAssess); + page.setRecords(annualAssessInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商年度考核列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java index dcfe4f3..7d8dbff 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java @@ -1,11 +1,16 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest; import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; import com.casic.missiles.modular.system.dto.SupplierInfoListResponse; import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusSupplierInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,11 +26,23 @@ */ @RestController @RequestMapping("/supplierInfo") -public class BusSupplierInfoController { +public class BusSupplierInfoController extends ExportController { @Autowired private IBusSupplierInfoService supplierInfoService; /** + * 供应商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInfo busSupplierInfo) { + List busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busSupplierInfos); + return ResponseData.success(super.packForBT(pages)); + } + + /** * 供应商列表（不分页） */ @PostMapping("/list") @@ -90,4 +107,13 @@ return ResponseData.success(reviewDetailResponse); } + /** + * 供应商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody SupplierInfoAddRequest supplierInfoAddRequest) { + return supplierInfoService.add(supplierInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java index e4f2a13..eba3dc0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; +import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierInputReview") -public class BusSupplierInputReviewController { +public class BusSupplierInputReviewController extends ExportController { @Autowired private IBusSupplierInputReviewService inputReviewService; /** + * 供应商资料录库评审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInputReview inputReview) { + Page page = PageFactory.defaultPage(); + List inputReviewInfoList = inputReviewService.getInputReviewInfoList(inputReview); + page.setRecords(inputReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商资料录库评审列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java index a4e5d70..fa9572a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java @@ -1,6 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusSupplierInfo; import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,9 +24,20 @@ */ @RestController @RequestMapping("/supplierPreReview") -public class BusSupplierPreReviewController { +public class BusSupplierPreReviewController extends ExportController { @Autowired private IBusSupplierPreReviewService preReviewService; + /** + * 供应商资料预审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierPreReview preReview) { + Page page = PageFactory.defaultPage(); + List preReviewInfoList = preReviewService.getPreReviewInfoList(preReview); + page.setRecords(preReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } /** * 供应商资料预审列表（不分页） diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java index 6cbfe1e..278ab5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java @@ -1,5 +1,8 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate; @@ -22,11 +25,23 @@ */ @RestController @RequestMapping("/supplierQuarterlyEvaluate") -public class BusSupplierQuarterlyEvaluateController { +public class BusSupplierQuarterlyEvaluateController extends ExportController { @Autowired private IBusSupplierQuarterlyEvaluateService quarterlyEvaluateService; /** + * 供应商季度评价列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) { + Page page = PageFactory.defaultPage(); + List quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoList(quarterlyEvaluate); + page.setRecords(quarterlyEvaluateList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商季度评价列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java index 3ece5df..61bf830 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java @@ -1,16 +1,19 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.codec.Base64; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; import com.casic.missiles.model.application.event.core.EventPublisher; import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.event.UserEvent; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.modular.system.redis.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.text.MessageFormat; /** * @ClassName DemoController @@ -24,6 +27,9 @@ @Autowired private EventPublisher publisher; + @Autowired + private RedisUtil redisUtil; + /** * 获取mockToken */ @@ -36,5 +42,29 @@ return ResponseData.success(); } +// /** +// * 燃气压力项目接收数据测试（拓普瑞平台） +// */ +// @PostMapping("/recv") +// @ResponseBody +// public Object recv(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("pressure:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb"); +// System.out.println(encode); +// return ResponseData.success(); +// } +// +// /** +// * 燃气压力项目接收数据测试（电信平台） +// */ +// @PostMapping("/recv2") +// @ResponseBody +// public Object recv2(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("aep:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// return ResponseData.success(); +// } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java index 1eed88c..38a1326 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java @@ -1,23 +1,66 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SnInfoOperateRequest; +import com.casic.missiles.modular.system.enums.OperateTypeEnum; +import com.casic.missiles.modular.system.model.BusQualifyInfo; +import com.casic.missiles.modular.system.service.IBusQualifyInfoService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** - * @Description: 系统配置 + * @Description: 系统配置，资质要求增删查改 * @Author: wangpeng * @Date: 2022/9/26 15:43 */ @RestController @RequestMapping("/sys") -public class SysConfigController { +public class SysConfigController extends ExportController { + @Autowired + private IBusQualifyInfoService qualifyInfoService; /** - * 资质要求 + * 资质要求列表（分页） */ - @PostMapping("/qualify") + @PostMapping("/qualify/listPage") @ResponseBody - public Object list() { - // TODO: 2022/9/26 资质要求增删查改 + public Object listPage(@RequestBody BusQualifyInfo busQualifyInfo) { + Page page = PageFactory.defaultPage(); + List qualifyInfos = qualifyInfoService.getQualifyListPage(page, busQualifyInfo); + page.setRecords(qualifyInfos); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 资质要求列表（不分页） + */ + @PostMapping("/qualify/list") + @ResponseBody + public Object list(@RequestBody BusQualifyInfo busQualifyInfo) { + List qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo); + return ResponseData.success(qualifyInfos); + } + + /** + * 资质要求增删查改 + */ + @PostMapping("/qualify/{operation}") + @ResponseBody + public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody BusQualifyInfo busQualifyInfo) { + if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { + return qualifyInfoService.addQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)) { + return qualifyInfoService.updateQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteBatchQualifyInfo(busQualifyInfo.getIds()); + } return null; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 806de2b..5d9f6d9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -44,10 +44,9 @@ @Autowired private SMSUtil smsUtil; -// @Autowired -// private AbstractUserService userService; - - + /** + * 发送短信验证码 + */ @PostMapping("/sms/send/{phone}") public ResponseData sendMsg(@PathVariable(name = "phone") String phone) { String key = MessageFormat.format(CacheKeys.SMS_TIMEOUT, phone); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java index 248e33e..8285662 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java @@ -18,4 +18,6 @@ public interface AppPushInfoMapper extends BaseMapper { List selectPushInfoList(@Param("page") Page page, @Param("pushInfo") AppPushInfo pushInfo); + + int updateStatusById(@Param("pushInfo") AppPushInfo pushInfo); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java index d5e0c2a..568cde2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java @@ -17,7 +17,7 @@ */ public interface BusCategoryInfoMapper extends BaseMapper { - List selectCategoryInfoListPage(@Param("page") Page page, BusCategoryInfo busCategoryInfo); + List selectCategoryInfoListPage(@Param("page") Page page, @Param("busCategoryInfo") BusCategoryInfo busCategoryInfo); BusCategoryInfo selectCategoryInfo(@Param("categoryCode") String categoryCode); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java index 32d9e03..f3e306b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java @@ -50,6 +50,9 @@ public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody AppPushInfo pushInfo) { if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { return pushInfoService.addPushInfo(pushInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)){ + //只更新已读状态 + return pushInfoService.updatePushInfo(pushInfo); }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ return pushInfoService.deletePushInfo(pushInfo); }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ @@ -64,8 +67,8 @@ @PostMapping("/detail") @ResponseBody public Object detail(AppPushInfo pushInfo) { - AppPushInfo pushInfos = pushInfoService.pushInfoDetail(pushInfo); - return ResponseData.success(pushInfos); + AppPushInfo info = pushInfoService.pushInfoDetail(pushInfo); + return ResponseData.success(info); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java index 07e59e3..a7e6b26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java @@ -14,10 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + import java.util.Date; import java.util.Objects; @@ -82,4 +80,11 @@ } } + //根据用户id查用户信息 + @GetMapping("/info") + public Object info(String account) { + User user = this.userService.getByAccount(account); + return ResponseData.success(user); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java index 3f6784b..6546fdf 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.DistributorInfoListResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusDistributorInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,9 +23,22 @@ */ @RestController @RequestMapping("/distributorInfo") -public class BusDistributorInfoController { +public class BusDistributorInfoController extends ExportController { @Autowired private IBusDistributorInfoService distributorInfoService; + + /** + * 经销商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusDistributorInfo distributorInfo) { + List distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), distributorInfoList); + return ResponseData.success(super.packForBT(pages)); + } + /** * 经销商列表（不分页） */ @@ -74,9 +88,17 @@ @PostMapping("/business/detail") @ResponseBody public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) { - String distributorCode = distributorInfo.getDistributorCode(); BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo); return ResponseData.success(detailBusiness); } + /** + * 经销商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody DistributorInfoAddRequest distributorInfoAddRequest) { + return distributorInfoService.add(distributorInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java index fa64dab..a8c2d17 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess; +import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierAnnualAssess") -public class BusSupplierAnnualAssessController { +public class BusSupplierAnnualAssessController extends ExportController { @Autowired private IBusSupplierAnnualAssessService annualAssessService; /** + * 供应商年度考核列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) { + Page page = PageFactory.defaultPage(); + List annualAssessInfoList = annualAssessService.getAnnualAssessInfoList(annualAssess); + page.setRecords(annualAssessInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商年度考核列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java index dcfe4f3..7d8dbff 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java @@ -1,11 +1,16 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest; import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; import com.casic.missiles.modular.system.dto.SupplierInfoListResponse; import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusSupplierInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,11 +26,23 @@ */ @RestController @RequestMapping("/supplierInfo") -public class BusSupplierInfoController { +public class BusSupplierInfoController extends ExportController { @Autowired private IBusSupplierInfoService supplierInfoService; /** + * 供应商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInfo busSupplierInfo) { + List busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busSupplierInfos); + return ResponseData.success(super.packForBT(pages)); + } + + /** * 供应商列表（不分页） */ @PostMapping("/list") @@ -90,4 +107,13 @@ return ResponseData.success(reviewDetailResponse); } + /** + * 供应商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody SupplierInfoAddRequest supplierInfoAddRequest) { + return supplierInfoService.add(supplierInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java index e4f2a13..eba3dc0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; +import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierInputReview") -public class BusSupplierInputReviewController { +public class BusSupplierInputReviewController extends ExportController { @Autowired private IBusSupplierInputReviewService inputReviewService; /** + * 供应商资料录库评审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInputReview inputReview) { + Page page = PageFactory.defaultPage(); + List inputReviewInfoList = inputReviewService.getInputReviewInfoList(inputReview); + page.setRecords(inputReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商资料录库评审列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java index a4e5d70..fa9572a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java @@ -1,6 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusSupplierInfo; import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,9 +24,20 @@ */ @RestController @RequestMapping("/supplierPreReview") -public class BusSupplierPreReviewController { +public class BusSupplierPreReviewController extends ExportController { @Autowired private IBusSupplierPreReviewService preReviewService; + /** + * 供应商资料预审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierPreReview preReview) { + Page page = PageFactory.defaultPage(); + List preReviewInfoList = preReviewService.getPreReviewInfoList(preReview); + page.setRecords(preReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } /** * 供应商资料预审列表（不分页） diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java index 6cbfe1e..278ab5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java @@ -1,5 +1,8 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate; @@ -22,11 +25,23 @@ */ @RestController @RequestMapping("/supplierQuarterlyEvaluate") -public class BusSupplierQuarterlyEvaluateController { +public class BusSupplierQuarterlyEvaluateController extends ExportController { @Autowired private IBusSupplierQuarterlyEvaluateService quarterlyEvaluateService; /** + * 供应商季度评价列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) { + Page page = PageFactory.defaultPage(); + List quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoList(quarterlyEvaluate); + page.setRecords(quarterlyEvaluateList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商季度评价列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java index 3ece5df..61bf830 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java @@ -1,16 +1,19 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.codec.Base64; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; import com.casic.missiles.model.application.event.core.EventPublisher; import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.event.UserEvent; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.modular.system.redis.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.text.MessageFormat; /** * @ClassName DemoController @@ -24,6 +27,9 @@ @Autowired private EventPublisher publisher; + @Autowired + private RedisUtil redisUtil; + /** * 获取mockToken */ @@ -36,5 +42,29 @@ return ResponseData.success(); } +// /** +// * 燃气压力项目接收数据测试（拓普瑞平台） +// */ +// @PostMapping("/recv") +// @ResponseBody +// public Object recv(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("pressure:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb"); +// System.out.println(encode); +// return ResponseData.success(); +// } +// +// /** +// * 燃气压力项目接收数据测试（电信平台） +// */ +// @PostMapping("/recv2") +// @ResponseBody +// public Object recv2(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("aep:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// return ResponseData.success(); +// } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java index 1eed88c..38a1326 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java @@ -1,23 +1,66 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SnInfoOperateRequest; +import com.casic.missiles.modular.system.enums.OperateTypeEnum; +import com.casic.missiles.modular.system.model.BusQualifyInfo; +import com.casic.missiles.modular.system.service.IBusQualifyInfoService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** - * @Description: 系统配置 + * @Description: 系统配置，资质要求增删查改 * @Author: wangpeng * @Date: 2022/9/26 15:43 */ @RestController @RequestMapping("/sys") -public class SysConfigController { +public class SysConfigController extends ExportController { + @Autowired + private IBusQualifyInfoService qualifyInfoService; /** - * 资质要求 + * 资质要求列表（分页） */ - @PostMapping("/qualify") + @PostMapping("/qualify/listPage") @ResponseBody - public Object list() { - // TODO: 2022/9/26 资质要求增删查改 + public Object listPage(@RequestBody BusQualifyInfo busQualifyInfo) { + Page page = PageFactory.defaultPage(); + List qualifyInfos = qualifyInfoService.getQualifyListPage(page, busQualifyInfo); + page.setRecords(qualifyInfos); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 资质要求列表（不分页） + */ + @PostMapping("/qualify/list") + @ResponseBody + public Object list(@RequestBody BusQualifyInfo busQualifyInfo) { + List qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo); + return ResponseData.success(qualifyInfos); + } + + /** + * 资质要求增删查改 + */ + @PostMapping("/qualify/{operation}") + @ResponseBody + public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody BusQualifyInfo busQualifyInfo) { + if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { + return qualifyInfoService.addQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)) { + return qualifyInfoService.updateQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteBatchQualifyInfo(busQualifyInfo.getIds()); + } return null; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 806de2b..5d9f6d9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -44,10 +44,9 @@ @Autowired private SMSUtil smsUtil; -// @Autowired -// private AbstractUserService userService; - - + /** + * 发送短信验证码 + */ @PostMapping("/sms/send/{phone}") public ResponseData sendMsg(@PathVariable(name = "phone") String phone) { String key = MessageFormat.format(CacheKeys.SMS_TIMEOUT, phone); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java index 248e33e..8285662 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java @@ -18,4 +18,6 @@ public interface AppPushInfoMapper extends BaseMapper { List selectPushInfoList(@Param("page") Page page, @Param("pushInfo") AppPushInfo pushInfo); + + int updateStatusById(@Param("pushInfo") AppPushInfo pushInfo); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java index d5e0c2a..568cde2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java @@ -17,7 +17,7 @@ */ public interface BusCategoryInfoMapper extends BaseMapper { - List selectCategoryInfoListPage(@Param("page") Page page, BusCategoryInfo busCategoryInfo); + List selectCategoryInfoListPage(@Param("page") Page page, @Param("busCategoryInfo") BusCategoryInfo busCategoryInfo); BusCategoryInfo selectCategoryInfo(@Param("categoryCode") String categoryCode); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java new file mode 100644 index 0000000..c43511c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.system.model.BusQualifyInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 资质要求表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2022-10-11 + */ +public interface BusQualifyInfoMapper extends BaseMapper { + + List selectQualifyInfoListPage(@Param("page") Page page, @Param("busQualifyInfo") BusQualifyInfo busQualifyInfo); + + List selectQualifyInfoList(@Param("busQualifyInfo") BusQualifyInfo busQualifyInfo); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java index 32d9e03..f3e306b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java @@ -50,6 +50,9 @@ public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody AppPushInfo pushInfo) { if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { return pushInfoService.addPushInfo(pushInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)){ + //只更新已读状态 + return pushInfoService.updatePushInfo(pushInfo); }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ return pushInfoService.deletePushInfo(pushInfo); }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ @@ -64,8 +67,8 @@ @PostMapping("/detail") @ResponseBody public Object detail(AppPushInfo pushInfo) { - AppPushInfo pushInfos = pushInfoService.pushInfoDetail(pushInfo); - return ResponseData.success(pushInfos); + AppPushInfo info = pushInfoService.pushInfoDetail(pushInfo); + return ResponseData.success(info); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java index 07e59e3..a7e6b26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java @@ -14,10 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + import java.util.Date; import java.util.Objects; @@ -82,4 +80,11 @@ } } + //根据用户id查用户信息 + @GetMapping("/info") + public Object info(String account) { + User user = this.userService.getByAccount(account); + return ResponseData.success(user); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java index 3f6784b..6546fdf 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.DistributorInfoListResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusDistributorInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,9 +23,22 @@ */ @RestController @RequestMapping("/distributorInfo") -public class BusDistributorInfoController { +public class BusDistributorInfoController extends ExportController { @Autowired private IBusDistributorInfoService distributorInfoService; + + /** + * 经销商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusDistributorInfo distributorInfo) { + List distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), distributorInfoList); + return ResponseData.success(super.packForBT(pages)); + } + /** * 经销商列表（不分页） */ @@ -74,9 +88,17 @@ @PostMapping("/business/detail") @ResponseBody public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) { - String distributorCode = distributorInfo.getDistributorCode(); BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo); return ResponseData.success(detailBusiness); } + /** + * 经销商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody DistributorInfoAddRequest distributorInfoAddRequest) { + return distributorInfoService.add(distributorInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java index fa64dab..a8c2d17 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess; +import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierAnnualAssess") -public class BusSupplierAnnualAssessController { +public class BusSupplierAnnualAssessController extends ExportController { @Autowired private IBusSupplierAnnualAssessService annualAssessService; /** + * 供应商年度考核列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) { + Page page = PageFactory.defaultPage(); + List annualAssessInfoList = annualAssessService.getAnnualAssessInfoList(annualAssess); + page.setRecords(annualAssessInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商年度考核列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java index dcfe4f3..7d8dbff 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java @@ -1,11 +1,16 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest; import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; import com.casic.missiles.modular.system.dto.SupplierInfoListResponse; import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusSupplierInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,11 +26,23 @@ */ @RestController @RequestMapping("/supplierInfo") -public class BusSupplierInfoController { +public class BusSupplierInfoController extends ExportController { @Autowired private IBusSupplierInfoService supplierInfoService; /** + * 供应商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInfo busSupplierInfo) { + List busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busSupplierInfos); + return ResponseData.success(super.packForBT(pages)); + } + + /** * 供应商列表（不分页） */ @PostMapping("/list") @@ -90,4 +107,13 @@ return ResponseData.success(reviewDetailResponse); } + /** + * 供应商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody SupplierInfoAddRequest supplierInfoAddRequest) { + return supplierInfoService.add(supplierInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java index e4f2a13..eba3dc0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; +import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierInputReview") -public class BusSupplierInputReviewController { +public class BusSupplierInputReviewController extends ExportController { @Autowired private IBusSupplierInputReviewService inputReviewService; /** + * 供应商资料录库评审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInputReview inputReview) { + Page page = PageFactory.defaultPage(); + List inputReviewInfoList = inputReviewService.getInputReviewInfoList(inputReview); + page.setRecords(inputReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商资料录库评审列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java index a4e5d70..fa9572a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java @@ -1,6 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusSupplierInfo; import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,9 +24,20 @@ */ @RestController @RequestMapping("/supplierPreReview") -public class BusSupplierPreReviewController { +public class BusSupplierPreReviewController extends ExportController { @Autowired private IBusSupplierPreReviewService preReviewService; + /** + * 供应商资料预审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierPreReview preReview) { + Page page = PageFactory.defaultPage(); + List preReviewInfoList = preReviewService.getPreReviewInfoList(preReview); + page.setRecords(preReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } /** * 供应商资料预审列表（不分页） diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java index 6cbfe1e..278ab5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java @@ -1,5 +1,8 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate; @@ -22,11 +25,23 @@ */ @RestController @RequestMapping("/supplierQuarterlyEvaluate") -public class BusSupplierQuarterlyEvaluateController { +public class BusSupplierQuarterlyEvaluateController extends ExportController { @Autowired private IBusSupplierQuarterlyEvaluateService quarterlyEvaluateService; /** + * 供应商季度评价列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) { + Page page = PageFactory.defaultPage(); + List quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoList(quarterlyEvaluate); + page.setRecords(quarterlyEvaluateList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商季度评价列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java index 3ece5df..61bf830 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java @@ -1,16 +1,19 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.codec.Base64; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; import com.casic.missiles.model.application.event.core.EventPublisher; import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.event.UserEvent; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.modular.system.redis.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.text.MessageFormat; /** * @ClassName DemoController @@ -24,6 +27,9 @@ @Autowired private EventPublisher publisher; + @Autowired + private RedisUtil redisUtil; + /** * 获取mockToken */ @@ -36,5 +42,29 @@ return ResponseData.success(); } +// /** +// * 燃气压力项目接收数据测试（拓普瑞平台） +// */ +// @PostMapping("/recv") +// @ResponseBody +// public Object recv(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("pressure:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb"); +// System.out.println(encode); +// return ResponseData.success(); +// } +// +// /** +// * 燃气压力项目接收数据测试（电信平台） +// */ +// @PostMapping("/recv2") +// @ResponseBody +// public Object recv2(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("aep:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// return ResponseData.success(); +// } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java index 1eed88c..38a1326 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java @@ -1,23 +1,66 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SnInfoOperateRequest; +import com.casic.missiles.modular.system.enums.OperateTypeEnum; +import com.casic.missiles.modular.system.model.BusQualifyInfo; +import com.casic.missiles.modular.system.service.IBusQualifyInfoService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** - * @Description: 系统配置 + * @Description: 系统配置，资质要求增删查改 * @Author: wangpeng * @Date: 2022/9/26 15:43 */ @RestController @RequestMapping("/sys") -public class SysConfigController { +public class SysConfigController extends ExportController { + @Autowired + private IBusQualifyInfoService qualifyInfoService; /** - * 资质要求 + * 资质要求列表（分页） */ - @PostMapping("/qualify") + @PostMapping("/qualify/listPage") @ResponseBody - public Object list() { - // TODO: 2022/9/26 资质要求增删查改 + public Object listPage(@RequestBody BusQualifyInfo busQualifyInfo) { + Page page = PageFactory.defaultPage(); + List qualifyInfos = qualifyInfoService.getQualifyListPage(page, busQualifyInfo); + page.setRecords(qualifyInfos); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 资质要求列表（不分页） + */ + @PostMapping("/qualify/list") + @ResponseBody + public Object list(@RequestBody BusQualifyInfo busQualifyInfo) { + List qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo); + return ResponseData.success(qualifyInfos); + } + + /** + * 资质要求增删查改 + */ + @PostMapping("/qualify/{operation}") + @ResponseBody + public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody BusQualifyInfo busQualifyInfo) { + if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { + return qualifyInfoService.addQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)) { + return qualifyInfoService.updateQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteBatchQualifyInfo(busQualifyInfo.getIds()); + } return null; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 806de2b..5d9f6d9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -44,10 +44,9 @@ @Autowired private SMSUtil smsUtil; -// @Autowired -// private AbstractUserService userService; - - + /** + * 发送短信验证码 + */ @PostMapping("/sms/send/{phone}") public ResponseData sendMsg(@PathVariable(name = "phone") String phone) { String key = MessageFormat.format(CacheKeys.SMS_TIMEOUT, phone); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java index 248e33e..8285662 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java @@ -18,4 +18,6 @@ public interface AppPushInfoMapper extends BaseMapper { List selectPushInfoList(@Param("page") Page page, @Param("pushInfo") AppPushInfo pushInfo); + + int updateStatusById(@Param("pushInfo") AppPushInfo pushInfo); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java index d5e0c2a..568cde2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java @@ -17,7 +17,7 @@ */ public interface BusCategoryInfoMapper extends BaseMapper { - List selectCategoryInfoListPage(@Param("page") Page page, BusCategoryInfo busCategoryInfo); + List selectCategoryInfoListPage(@Param("page") Page page, @Param("busCategoryInfo") BusCategoryInfo busCategoryInfo); BusCategoryInfo selectCategoryInfo(@Param("categoryCode") String categoryCode); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java new file mode 100644 index 0000000..c43511c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.system.model.BusQualifyInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 资质要求表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2022-10-11 + */ +public interface BusQualifyInfoMapper extends BaseMapper { + + List selectQualifyInfoListPage(@Param("page") Page page, @Param("busQualifyInfo") BusQualifyInfo busQualifyInfo); + + List selectQualifyInfoList(@Param("busQualifyInfo") BusQualifyInfo busQualifyInfo); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml index b6c1595..317d06b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml @@ -4,7 +4,7 @@ id AS id, message_code AS messageCode, message_title AS messageTitle, message_content AS messageContent, - target_users AS targetUsers, create_time AS createTime, update_time AS updateTime + target_users AS targetUsers, message_status AS messageStatus, create_time AS createTime, update_time AS updateTime + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java index 32d9e03..f3e306b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java @@ -50,6 +50,9 @@ public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody AppPushInfo pushInfo) { if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { return pushInfoService.addPushInfo(pushInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)){ + //只更新已读状态 + return pushInfoService.updatePushInfo(pushInfo); }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ return pushInfoService.deletePushInfo(pushInfo); }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ @@ -64,8 +67,8 @@ @PostMapping("/detail") @ResponseBody public Object detail(AppPushInfo pushInfo) { - AppPushInfo pushInfos = pushInfoService.pushInfoDetail(pushInfo); - return ResponseData.success(pushInfos); + AppPushInfo info = pushInfoService.pushInfoDetail(pushInfo); + return ResponseData.success(info); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java index 07e59e3..a7e6b26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java @@ -14,10 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + import java.util.Date; import java.util.Objects; @@ -82,4 +80,11 @@ } } + //根据用户id查用户信息 + @GetMapping("/info") + public Object info(String account) { + User user = this.userService.getByAccount(account); + return ResponseData.success(user); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java index 3f6784b..6546fdf 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.DistributorInfoListResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusDistributorInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,9 +23,22 @@ */ @RestController @RequestMapping("/distributorInfo") -public class BusDistributorInfoController { +public class BusDistributorInfoController extends ExportController { @Autowired private IBusDistributorInfoService distributorInfoService; + + /** + * 经销商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusDistributorInfo distributorInfo) { + List distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), distributorInfoList); + return ResponseData.success(super.packForBT(pages)); + } + /** * 经销商列表（不分页） */ @@ -74,9 +88,17 @@ @PostMapping("/business/detail") @ResponseBody public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) { - String distributorCode = distributorInfo.getDistributorCode(); BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo); return ResponseData.success(detailBusiness); } + /** + * 经销商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody DistributorInfoAddRequest distributorInfoAddRequest) { + return distributorInfoService.add(distributorInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java index fa64dab..a8c2d17 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess; +import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierAnnualAssess") -public class BusSupplierAnnualAssessController { +public class BusSupplierAnnualAssessController extends ExportController { @Autowired private IBusSupplierAnnualAssessService annualAssessService; /** + * 供应商年度考核列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) { + Page page = PageFactory.defaultPage(); + List annualAssessInfoList = annualAssessService.getAnnualAssessInfoList(annualAssess); + page.setRecords(annualAssessInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商年度考核列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java index dcfe4f3..7d8dbff 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java @@ -1,11 +1,16 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest; import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; import com.casic.missiles.modular.system.dto.SupplierInfoListResponse; import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusSupplierInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,11 +26,23 @@ */ @RestController @RequestMapping("/supplierInfo") -public class BusSupplierInfoController { +public class BusSupplierInfoController extends ExportController { @Autowired private IBusSupplierInfoService supplierInfoService; /** + * 供应商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInfo busSupplierInfo) { + List busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busSupplierInfos); + return ResponseData.success(super.packForBT(pages)); + } + + /** * 供应商列表（不分页） */ @PostMapping("/list") @@ -90,4 +107,13 @@ return ResponseData.success(reviewDetailResponse); } + /** + * 供应商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody SupplierInfoAddRequest supplierInfoAddRequest) { + return supplierInfoService.add(supplierInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java index e4f2a13..eba3dc0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; +import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierInputReview") -public class BusSupplierInputReviewController { +public class BusSupplierInputReviewController extends ExportController { @Autowired private IBusSupplierInputReviewService inputReviewService; /** + * 供应商资料录库评审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInputReview inputReview) { + Page page = PageFactory.defaultPage(); + List inputReviewInfoList = inputReviewService.getInputReviewInfoList(inputReview); + page.setRecords(inputReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商资料录库评审列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java index a4e5d70..fa9572a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java @@ -1,6 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusSupplierInfo; import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,9 +24,20 @@ */ @RestController @RequestMapping("/supplierPreReview") -public class BusSupplierPreReviewController { +public class BusSupplierPreReviewController extends ExportController { @Autowired private IBusSupplierPreReviewService preReviewService; + /** + * 供应商资料预审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierPreReview preReview) { + Page page = PageFactory.defaultPage(); + List preReviewInfoList = preReviewService.getPreReviewInfoList(preReview); + page.setRecords(preReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } /** * 供应商资料预审列表（不分页） diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java index 6cbfe1e..278ab5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java @@ -1,5 +1,8 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate; @@ -22,11 +25,23 @@ */ @RestController @RequestMapping("/supplierQuarterlyEvaluate") -public class BusSupplierQuarterlyEvaluateController { +public class BusSupplierQuarterlyEvaluateController extends ExportController { @Autowired private IBusSupplierQuarterlyEvaluateService quarterlyEvaluateService; /** + * 供应商季度评价列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) { + Page page = PageFactory.defaultPage(); + List quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoList(quarterlyEvaluate); + page.setRecords(quarterlyEvaluateList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商季度评价列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java index 3ece5df..61bf830 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java @@ -1,16 +1,19 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.codec.Base64; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; import com.casic.missiles.model.application.event.core.EventPublisher; import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.event.UserEvent; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.modular.system.redis.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.text.MessageFormat; /** * @ClassName DemoController @@ -24,6 +27,9 @@ @Autowired private EventPublisher publisher; + @Autowired + private RedisUtil redisUtil; + /** * 获取mockToken */ @@ -36,5 +42,29 @@ return ResponseData.success(); } +// /** +// * 燃气压力项目接收数据测试（拓普瑞平台） +// */ +// @PostMapping("/recv") +// @ResponseBody +// public Object recv(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("pressure:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb"); +// System.out.println(encode); +// return ResponseData.success(); +// } +// +// /** +// * 燃气压力项目接收数据测试（电信平台） +// */ +// @PostMapping("/recv2") +// @ResponseBody +// public Object recv2(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("aep:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// return ResponseData.success(); +// } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java index 1eed88c..38a1326 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java @@ -1,23 +1,66 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SnInfoOperateRequest; +import com.casic.missiles.modular.system.enums.OperateTypeEnum; +import com.casic.missiles.modular.system.model.BusQualifyInfo; +import com.casic.missiles.modular.system.service.IBusQualifyInfoService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** - * @Description: 系统配置 + * @Description: 系统配置，资质要求增删查改 * @Author: wangpeng * @Date: 2022/9/26 15:43 */ @RestController @RequestMapping("/sys") -public class SysConfigController { +public class SysConfigController extends ExportController { + @Autowired + private IBusQualifyInfoService qualifyInfoService; /** - * 资质要求 + * 资质要求列表（分页） */ - @PostMapping("/qualify") + @PostMapping("/qualify/listPage") @ResponseBody - public Object list() { - // TODO: 2022/9/26 资质要求增删查改 + public Object listPage(@RequestBody BusQualifyInfo busQualifyInfo) { + Page page = PageFactory.defaultPage(); + List qualifyInfos = qualifyInfoService.getQualifyListPage(page, busQualifyInfo); + page.setRecords(qualifyInfos); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 资质要求列表（不分页） + */ + @PostMapping("/qualify/list") + @ResponseBody + public Object list(@RequestBody BusQualifyInfo busQualifyInfo) { + List qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo); + return ResponseData.success(qualifyInfos); + } + + /** + * 资质要求增删查改 + */ + @PostMapping("/qualify/{operation}") + @ResponseBody + public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody BusQualifyInfo busQualifyInfo) { + if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { + return qualifyInfoService.addQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)) { + return qualifyInfoService.updateQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteBatchQualifyInfo(busQualifyInfo.getIds()); + } return null; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 806de2b..5d9f6d9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -44,10 +44,9 @@ @Autowired private SMSUtil smsUtil; -// @Autowired -// private AbstractUserService userService; - - + /** + * 发送短信验证码 + */ @PostMapping("/sms/send/{phone}") public ResponseData sendMsg(@PathVariable(name = "phone") String phone) { String key = MessageFormat.format(CacheKeys.SMS_TIMEOUT, phone); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java index 248e33e..8285662 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java @@ -18,4 +18,6 @@ public interface AppPushInfoMapper extends BaseMapper { List selectPushInfoList(@Param("page") Page page, @Param("pushInfo") AppPushInfo pushInfo); + + int updateStatusById(@Param("pushInfo") AppPushInfo pushInfo); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java index d5e0c2a..568cde2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java @@ -17,7 +17,7 @@ */ public interface BusCategoryInfoMapper extends BaseMapper { - List selectCategoryInfoListPage(@Param("page") Page page, BusCategoryInfo busCategoryInfo); + List selectCategoryInfoListPage(@Param("page") Page page, @Param("busCategoryInfo") BusCategoryInfo busCategoryInfo); BusCategoryInfo selectCategoryInfo(@Param("categoryCode") String categoryCode); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java new file mode 100644 index 0000000..c43511c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.system.model.BusQualifyInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 资质要求表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2022-10-11 + */ +public interface BusQualifyInfoMapper extends BaseMapper { + + List selectQualifyInfoListPage(@Param("page") Page page, @Param("busQualifyInfo") BusQualifyInfo busQualifyInfo); + + List selectQualifyInfoList(@Param("busQualifyInfo") BusQualifyInfo busQualifyInfo); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml index b6c1595..317d06b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml @@ -4,7 +4,7 @@ id AS id, message_code AS messageCode, message_title AS messageTitle, message_content AS messageContent, - target_users AS targetUsers, create_time AS createTime, update_time AS updateTime + target_users AS targetUsers, message_status AS messageStatus, create_time AS createTime, update_time AS updateTime + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java index 32d9e03..f3e306b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java @@ -50,6 +50,9 @@ public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody AppPushInfo pushInfo) { if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { return pushInfoService.addPushInfo(pushInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)){ + //只更新已读状态 + return pushInfoService.updatePushInfo(pushInfo); }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ return pushInfoService.deletePushInfo(pushInfo); }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ @@ -64,8 +67,8 @@ @PostMapping("/detail") @ResponseBody public Object detail(AppPushInfo pushInfo) { - AppPushInfo pushInfos = pushInfoService.pushInfoDetail(pushInfo); - return ResponseData.success(pushInfos); + AppPushInfo info = pushInfoService.pushInfoDetail(pushInfo); + return ResponseData.success(info); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java index 07e59e3..a7e6b26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java @@ -14,10 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + import java.util.Date; import java.util.Objects; @@ -82,4 +80,11 @@ } } + //根据用户id查用户信息 + @GetMapping("/info") + public Object info(String account) { + User user = this.userService.getByAccount(account); + return ResponseData.success(user); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java index 3f6784b..6546fdf 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.DistributorInfoListResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusDistributorInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,9 +23,22 @@ */ @RestController @RequestMapping("/distributorInfo") -public class BusDistributorInfoController { +public class BusDistributorInfoController extends ExportController { @Autowired private IBusDistributorInfoService distributorInfoService; + + /** + * 经销商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusDistributorInfo distributorInfo) { + List distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), distributorInfoList); + return ResponseData.success(super.packForBT(pages)); + } + /** * 经销商列表（不分页） */ @@ -74,9 +88,17 @@ @PostMapping("/business/detail") @ResponseBody public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) { - String distributorCode = distributorInfo.getDistributorCode(); BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo); return ResponseData.success(detailBusiness); } + /** + * 经销商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody DistributorInfoAddRequest distributorInfoAddRequest) { + return distributorInfoService.add(distributorInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java index fa64dab..a8c2d17 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess; +import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierAnnualAssess") -public class BusSupplierAnnualAssessController { +public class BusSupplierAnnualAssessController extends ExportController { @Autowired private IBusSupplierAnnualAssessService annualAssessService; /** + * 供应商年度考核列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) { + Page page = PageFactory.defaultPage(); + List annualAssessInfoList = annualAssessService.getAnnualAssessInfoList(annualAssess); + page.setRecords(annualAssessInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商年度考核列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java index dcfe4f3..7d8dbff 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java @@ -1,11 +1,16 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest; import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; import com.casic.missiles.modular.system.dto.SupplierInfoListResponse; import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusSupplierInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,11 +26,23 @@ */ @RestController @RequestMapping("/supplierInfo") -public class BusSupplierInfoController { +public class BusSupplierInfoController extends ExportController { @Autowired private IBusSupplierInfoService supplierInfoService; /** + * 供应商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInfo busSupplierInfo) { + List busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busSupplierInfos); + return ResponseData.success(super.packForBT(pages)); + } + + /** * 供应商列表（不分页） */ @PostMapping("/list") @@ -90,4 +107,13 @@ return ResponseData.success(reviewDetailResponse); } + /** + * 供应商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody SupplierInfoAddRequest supplierInfoAddRequest) { + return supplierInfoService.add(supplierInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java index e4f2a13..eba3dc0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; +import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierInputReview") -public class BusSupplierInputReviewController { +public class BusSupplierInputReviewController extends ExportController { @Autowired private IBusSupplierInputReviewService inputReviewService; /** + * 供应商资料录库评审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInputReview inputReview) { + Page page = PageFactory.defaultPage(); + List inputReviewInfoList = inputReviewService.getInputReviewInfoList(inputReview); + page.setRecords(inputReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商资料录库评审列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java index a4e5d70..fa9572a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java @@ -1,6 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusSupplierInfo; import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,9 +24,20 @@ */ @RestController @RequestMapping("/supplierPreReview") -public class BusSupplierPreReviewController { +public class BusSupplierPreReviewController extends ExportController { @Autowired private IBusSupplierPreReviewService preReviewService; + /** + * 供应商资料预审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierPreReview preReview) { + Page page = PageFactory.defaultPage(); + List preReviewInfoList = preReviewService.getPreReviewInfoList(preReview); + page.setRecords(preReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } /** * 供应商资料预审列表（不分页） diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java index 6cbfe1e..278ab5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java @@ -1,5 +1,8 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate; @@ -22,11 +25,23 @@ */ @RestController @RequestMapping("/supplierQuarterlyEvaluate") -public class BusSupplierQuarterlyEvaluateController { +public class BusSupplierQuarterlyEvaluateController extends ExportController { @Autowired private IBusSupplierQuarterlyEvaluateService quarterlyEvaluateService; /** + * 供应商季度评价列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) { + Page page = PageFactory.defaultPage(); + List quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoList(quarterlyEvaluate); + page.setRecords(quarterlyEvaluateList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商季度评价列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java index 3ece5df..61bf830 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java @@ -1,16 +1,19 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.codec.Base64; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; import com.casic.missiles.model.application.event.core.EventPublisher; import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.event.UserEvent; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.modular.system.redis.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.text.MessageFormat; /** * @ClassName DemoController @@ -24,6 +27,9 @@ @Autowired private EventPublisher publisher; + @Autowired + private RedisUtil redisUtil; + /** * 获取mockToken */ @@ -36,5 +42,29 @@ return ResponseData.success(); } +// /** +// * 燃气压力项目接收数据测试（拓普瑞平台） +// */ +// @PostMapping("/recv") +// @ResponseBody +// public Object recv(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("pressure:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb"); +// System.out.println(encode); +// return ResponseData.success(); +// } +// +// /** +// * 燃气压力项目接收数据测试（电信平台） +// */ +// @PostMapping("/recv2") +// @ResponseBody +// public Object recv2(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("aep:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// return ResponseData.success(); +// } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java index 1eed88c..38a1326 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java @@ -1,23 +1,66 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SnInfoOperateRequest; +import com.casic.missiles.modular.system.enums.OperateTypeEnum; +import com.casic.missiles.modular.system.model.BusQualifyInfo; +import com.casic.missiles.modular.system.service.IBusQualifyInfoService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** - * @Description: 系统配置 + * @Description: 系统配置，资质要求增删查改 * @Author: wangpeng * @Date: 2022/9/26 15:43 */ @RestController @RequestMapping("/sys") -public class SysConfigController { +public class SysConfigController extends ExportController { + @Autowired + private IBusQualifyInfoService qualifyInfoService; /** - * 资质要求 + * 资质要求列表（分页） */ - @PostMapping("/qualify") + @PostMapping("/qualify/listPage") @ResponseBody - public Object list() { - // TODO: 2022/9/26 资质要求增删查改 + public Object listPage(@RequestBody BusQualifyInfo busQualifyInfo) { + Page page = PageFactory.defaultPage(); + List qualifyInfos = qualifyInfoService.getQualifyListPage(page, busQualifyInfo); + page.setRecords(qualifyInfos); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 资质要求列表（不分页） + */ + @PostMapping("/qualify/list") + @ResponseBody + public Object list(@RequestBody BusQualifyInfo busQualifyInfo) { + List qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo); + return ResponseData.success(qualifyInfos); + } + + /** + * 资质要求增删查改 + */ + @PostMapping("/qualify/{operation}") + @ResponseBody + public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody BusQualifyInfo busQualifyInfo) { + if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { + return qualifyInfoService.addQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)) { + return qualifyInfoService.updateQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteBatchQualifyInfo(busQualifyInfo.getIds()); + } return null; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 806de2b..5d9f6d9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -44,10 +44,9 @@ @Autowired private SMSUtil smsUtil; -// @Autowired -// private AbstractUserService userService; - - + /** + * 发送短信验证码 + */ @PostMapping("/sms/send/{phone}") public ResponseData sendMsg(@PathVariable(name = "phone") String phone) { String key = MessageFormat.format(CacheKeys.SMS_TIMEOUT, phone); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java index 248e33e..8285662 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java @@ -18,4 +18,6 @@ public interface AppPushInfoMapper extends BaseMapper { List selectPushInfoList(@Param("page") Page page, @Param("pushInfo") AppPushInfo pushInfo); + + int updateStatusById(@Param("pushInfo") AppPushInfo pushInfo); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java index d5e0c2a..568cde2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java @@ -17,7 +17,7 @@ */ public interface BusCategoryInfoMapper extends BaseMapper { - List selectCategoryInfoListPage(@Param("page") Page page, BusCategoryInfo busCategoryInfo); + List selectCategoryInfoListPage(@Param("page") Page page, @Param("busCategoryInfo") BusCategoryInfo busCategoryInfo); BusCategoryInfo selectCategoryInfo(@Param("categoryCode") String categoryCode); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java new file mode 100644 index 0000000..c43511c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.system.model.BusQualifyInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 资质要求表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2022-10-11 + */ +public interface BusQualifyInfoMapper extends BaseMapper { + + List selectQualifyInfoListPage(@Param("page") Page page, @Param("busQualifyInfo") BusQualifyInfo busQualifyInfo); + + List selectQualifyInfoList(@Param("busQualifyInfo") BusQualifyInfo busQualifyInfo); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml index b6c1595..317d06b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml @@ -4,7 +4,7 @@ id AS id, message_code AS messageCode, message_title AS messageTitle, message_content AS messageContent, - target_users AS targetUsers, create_time AS createTime, update_time AS updateTime + target_users AS targetUsers, message_status AS messageStatus, create_time AS createTime, update_time AS updateTime + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java index 32d9e03..f3e306b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java @@ -50,6 +50,9 @@ public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody AppPushInfo pushInfo) { if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { return pushInfoService.addPushInfo(pushInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)){ + //只更新已读状态 + return pushInfoService.updatePushInfo(pushInfo); }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ return pushInfoService.deletePushInfo(pushInfo); }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ @@ -64,8 +67,8 @@ @PostMapping("/detail") @ResponseBody public Object detail(AppPushInfo pushInfo) { - AppPushInfo pushInfos = pushInfoService.pushInfoDetail(pushInfo); - return ResponseData.success(pushInfos); + AppPushInfo info = pushInfoService.pushInfoDetail(pushInfo); + return ResponseData.success(info); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java index 07e59e3..a7e6b26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java @@ -14,10 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + import java.util.Date; import java.util.Objects; @@ -82,4 +80,11 @@ } } + //根据用户id查用户信息 + @GetMapping("/info") + public Object info(String account) { + User user = this.userService.getByAccount(account); + return ResponseData.success(user); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java index 3f6784b..6546fdf 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.DistributorInfoListResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusDistributorInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,9 +23,22 @@ */ @RestController @RequestMapping("/distributorInfo") -public class BusDistributorInfoController { +public class BusDistributorInfoController extends ExportController { @Autowired private IBusDistributorInfoService distributorInfoService; + + /** + * 经销商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusDistributorInfo distributorInfo) { + List distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), distributorInfoList); + return ResponseData.success(super.packForBT(pages)); + } + /** * 经销商列表（不分页） */ @@ -74,9 +88,17 @@ @PostMapping("/business/detail") @ResponseBody public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) { - String distributorCode = distributorInfo.getDistributorCode(); BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo); return ResponseData.success(detailBusiness); } + /** + * 经销商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody DistributorInfoAddRequest distributorInfoAddRequest) { + return distributorInfoService.add(distributorInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java index fa64dab..a8c2d17 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess; +import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierAnnualAssess") -public class BusSupplierAnnualAssessController { +public class BusSupplierAnnualAssessController extends ExportController { @Autowired private IBusSupplierAnnualAssessService annualAssessService; /** + * 供应商年度考核列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) { + Page page = PageFactory.defaultPage(); + List annualAssessInfoList = annualAssessService.getAnnualAssessInfoList(annualAssess); + page.setRecords(annualAssessInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商年度考核列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java index dcfe4f3..7d8dbff 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java @@ -1,11 +1,16 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest; import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; import com.casic.missiles.modular.system.dto.SupplierInfoListResponse; import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusSupplierInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,11 +26,23 @@ */ @RestController @RequestMapping("/supplierInfo") -public class BusSupplierInfoController { +public class BusSupplierInfoController extends ExportController { @Autowired private IBusSupplierInfoService supplierInfoService; /** + * 供应商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInfo busSupplierInfo) { + List busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busSupplierInfos); + return ResponseData.success(super.packForBT(pages)); + } + + /** * 供应商列表（不分页） */ @PostMapping("/list") @@ -90,4 +107,13 @@ return ResponseData.success(reviewDetailResponse); } + /** + * 供应商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody SupplierInfoAddRequest supplierInfoAddRequest) { + return supplierInfoService.add(supplierInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java index e4f2a13..eba3dc0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; +import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierInputReview") -public class BusSupplierInputReviewController { +public class BusSupplierInputReviewController extends ExportController { @Autowired private IBusSupplierInputReviewService inputReviewService; /** + * 供应商资料录库评审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInputReview inputReview) { + Page page = PageFactory.defaultPage(); + List inputReviewInfoList = inputReviewService.getInputReviewInfoList(inputReview); + page.setRecords(inputReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商资料录库评审列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java index a4e5d70..fa9572a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java @@ -1,6 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusSupplierInfo; import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,9 +24,20 @@ */ @RestController @RequestMapping("/supplierPreReview") -public class BusSupplierPreReviewController { +public class BusSupplierPreReviewController extends ExportController { @Autowired private IBusSupplierPreReviewService preReviewService; + /** + * 供应商资料预审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierPreReview preReview) { + Page page = PageFactory.defaultPage(); + List preReviewInfoList = preReviewService.getPreReviewInfoList(preReview); + page.setRecords(preReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } /** * 供应商资料预审列表（不分页） diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java index 6cbfe1e..278ab5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java @@ -1,5 +1,8 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate; @@ -22,11 +25,23 @@ */ @RestController @RequestMapping("/supplierQuarterlyEvaluate") -public class BusSupplierQuarterlyEvaluateController { +public class BusSupplierQuarterlyEvaluateController extends ExportController { @Autowired private IBusSupplierQuarterlyEvaluateService quarterlyEvaluateService; /** + * 供应商季度评价列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) { + Page page = PageFactory.defaultPage(); + List quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoList(quarterlyEvaluate); + page.setRecords(quarterlyEvaluateList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商季度评价列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java index 3ece5df..61bf830 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java @@ -1,16 +1,19 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.codec.Base64; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; import com.casic.missiles.model.application.event.core.EventPublisher; import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.event.UserEvent; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.modular.system.redis.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.text.MessageFormat; /** * @ClassName DemoController @@ -24,6 +27,9 @@ @Autowired private EventPublisher publisher; + @Autowired + private RedisUtil redisUtil; + /** * 获取mockToken */ @@ -36,5 +42,29 @@ return ResponseData.success(); } +// /** +// * 燃气压力项目接收数据测试（拓普瑞平台） +// */ +// @PostMapping("/recv") +// @ResponseBody +// public Object recv(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("pressure:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb"); +// System.out.println(encode); +// return ResponseData.success(); +// } +// +// /** +// * 燃气压力项目接收数据测试（电信平台） +// */ +// @PostMapping("/recv2") +// @ResponseBody +// public Object recv2(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("aep:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// return ResponseData.success(); +// } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java index 1eed88c..38a1326 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java @@ -1,23 +1,66 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SnInfoOperateRequest; +import com.casic.missiles.modular.system.enums.OperateTypeEnum; +import com.casic.missiles.modular.system.model.BusQualifyInfo; +import com.casic.missiles.modular.system.service.IBusQualifyInfoService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** - * @Description: 系统配置 + * @Description: 系统配置，资质要求增删查改 * @Author: wangpeng * @Date: 2022/9/26 15:43 */ @RestController @RequestMapping("/sys") -public class SysConfigController { +public class SysConfigController extends ExportController { + @Autowired + private IBusQualifyInfoService qualifyInfoService; /** - * 资质要求 + * 资质要求列表（分页） */ - @PostMapping("/qualify") + @PostMapping("/qualify/listPage") @ResponseBody - public Object list() { - // TODO: 2022/9/26 资质要求增删查改 + public Object listPage(@RequestBody BusQualifyInfo busQualifyInfo) { + Page page = PageFactory.defaultPage(); + List qualifyInfos = qualifyInfoService.getQualifyListPage(page, busQualifyInfo); + page.setRecords(qualifyInfos); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 资质要求列表（不分页） + */ + @PostMapping("/qualify/list") + @ResponseBody + public Object list(@RequestBody BusQualifyInfo busQualifyInfo) { + List qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo); + return ResponseData.success(qualifyInfos); + } + + /** + * 资质要求增删查改 + */ + @PostMapping("/qualify/{operation}") + @ResponseBody + public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody BusQualifyInfo busQualifyInfo) { + if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { + return qualifyInfoService.addQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)) { + return qualifyInfoService.updateQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteBatchQualifyInfo(busQualifyInfo.getIds()); + } return null; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 806de2b..5d9f6d9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -44,10 +44,9 @@ @Autowired private SMSUtil smsUtil; -// @Autowired -// private AbstractUserService userService; - - + /** + * 发送短信验证码 + */ @PostMapping("/sms/send/{phone}") public ResponseData sendMsg(@PathVariable(name = "phone") String phone) { String key = MessageFormat.format(CacheKeys.SMS_TIMEOUT, phone); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java index 248e33e..8285662 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java @@ -18,4 +18,6 @@ public interface AppPushInfoMapper extends BaseMapper { List selectPushInfoList(@Param("page") Page page, @Param("pushInfo") AppPushInfo pushInfo); + + int updateStatusById(@Param("pushInfo") AppPushInfo pushInfo); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java index d5e0c2a..568cde2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java @@ -17,7 +17,7 @@ */ public interface BusCategoryInfoMapper extends BaseMapper { - List selectCategoryInfoListPage(@Param("page") Page page, BusCategoryInfo busCategoryInfo); + List selectCategoryInfoListPage(@Param("page") Page page, @Param("busCategoryInfo") BusCategoryInfo busCategoryInfo); BusCategoryInfo selectCategoryInfo(@Param("categoryCode") String categoryCode); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java new file mode 100644 index 0000000..c43511c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.system.model.BusQualifyInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 资质要求表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2022-10-11 + */ +public interface BusQualifyInfoMapper extends BaseMapper { + + List selectQualifyInfoListPage(@Param("page") Page page, @Param("busQualifyInfo") BusQualifyInfo busQualifyInfo); + + List selectQualifyInfoList(@Param("busQualifyInfo") BusQualifyInfo busQualifyInfo); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml index b6c1595..317d06b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml @@ -4,7 +4,7 @@ id AS id, message_code AS messageCode, message_title AS messageTitle, message_content AS messageContent, - target_users AS targetUsers, create_time AS createTime, update_time AS updateTime + target_users AS targetUsers, message_status AS messageStatus, create_time AS createTime, update_time AS updateTime + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java index 32d9e03..f3e306b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java @@ -50,6 +50,9 @@ public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody AppPushInfo pushInfo) { if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { return pushInfoService.addPushInfo(pushInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)){ + //只更新已读状态 + return pushInfoService.updatePushInfo(pushInfo); }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ return pushInfoService.deletePushInfo(pushInfo); }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ @@ -64,8 +67,8 @@ @PostMapping("/detail") @ResponseBody public Object detail(AppPushInfo pushInfo) { - AppPushInfo pushInfos = pushInfoService.pushInfoDetail(pushInfo); - return ResponseData.success(pushInfos); + AppPushInfo info = pushInfoService.pushInfoDetail(pushInfo); + return ResponseData.success(info); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java index 07e59e3..a7e6b26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java @@ -14,10 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + import java.util.Date; import java.util.Objects; @@ -82,4 +80,11 @@ } } + //根据用户id查用户信息 + @GetMapping("/info") + public Object info(String account) { + User user = this.userService.getByAccount(account); + return ResponseData.success(user); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java index 3f6784b..6546fdf 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.DistributorInfoListResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusDistributorInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,9 +23,22 @@ */ @RestController @RequestMapping("/distributorInfo") -public class BusDistributorInfoController { +public class BusDistributorInfoController extends ExportController { @Autowired private IBusDistributorInfoService distributorInfoService; + + /** + * 经销商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusDistributorInfo distributorInfo) { + List distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), distributorInfoList); + return ResponseData.success(super.packForBT(pages)); + } + /** * 经销商列表（不分页） */ @@ -74,9 +88,17 @@ @PostMapping("/business/detail") @ResponseBody public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) { - String distributorCode = distributorInfo.getDistributorCode(); BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo); return ResponseData.success(detailBusiness); } + /** + * 经销商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody DistributorInfoAddRequest distributorInfoAddRequest) { + return distributorInfoService.add(distributorInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java index fa64dab..a8c2d17 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess; +import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierAnnualAssess") -public class BusSupplierAnnualAssessController { +public class BusSupplierAnnualAssessController extends ExportController { @Autowired private IBusSupplierAnnualAssessService annualAssessService; /** + * 供应商年度考核列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) { + Page page = PageFactory.defaultPage(); + List annualAssessInfoList = annualAssessService.getAnnualAssessInfoList(annualAssess); + page.setRecords(annualAssessInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商年度考核列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java index dcfe4f3..7d8dbff 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java @@ -1,11 +1,16 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest; import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; import com.casic.missiles.modular.system.dto.SupplierInfoListResponse; import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusSupplierInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,11 +26,23 @@ */ @RestController @RequestMapping("/supplierInfo") -public class BusSupplierInfoController { +public class BusSupplierInfoController extends ExportController { @Autowired private IBusSupplierInfoService supplierInfoService; /** + * 供应商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInfo busSupplierInfo) { + List busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busSupplierInfos); + return ResponseData.success(super.packForBT(pages)); + } + + /** * 供应商列表（不分页） */ @PostMapping("/list") @@ -90,4 +107,13 @@ return ResponseData.success(reviewDetailResponse); } + /** + * 供应商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody SupplierInfoAddRequest supplierInfoAddRequest) { + return supplierInfoService.add(supplierInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java index e4f2a13..eba3dc0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; +import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierInputReview") -public class BusSupplierInputReviewController { +public class BusSupplierInputReviewController extends ExportController { @Autowired private IBusSupplierInputReviewService inputReviewService; /** + * 供应商资料录库评审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInputReview inputReview) { + Page page = PageFactory.defaultPage(); + List inputReviewInfoList = inputReviewService.getInputReviewInfoList(inputReview); + page.setRecords(inputReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商资料录库评审列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java index a4e5d70..fa9572a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java @@ -1,6 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusSupplierInfo; import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,9 +24,20 @@ */ @RestController @RequestMapping("/supplierPreReview") -public class BusSupplierPreReviewController { +public class BusSupplierPreReviewController extends ExportController { @Autowired private IBusSupplierPreReviewService preReviewService; + /** + * 供应商资料预审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierPreReview preReview) { + Page page = PageFactory.defaultPage(); + List preReviewInfoList = preReviewService.getPreReviewInfoList(preReview); + page.setRecords(preReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } /** * 供应商资料预审列表（不分页） diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java index 6cbfe1e..278ab5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java @@ -1,5 +1,8 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate; @@ -22,11 +25,23 @@ */ @RestController @RequestMapping("/supplierQuarterlyEvaluate") -public class BusSupplierQuarterlyEvaluateController { +public class BusSupplierQuarterlyEvaluateController extends ExportController { @Autowired private IBusSupplierQuarterlyEvaluateService quarterlyEvaluateService; /** + * 供应商季度评价列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) { + Page page = PageFactory.defaultPage(); + List quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoList(quarterlyEvaluate); + page.setRecords(quarterlyEvaluateList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商季度评价列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java index 3ece5df..61bf830 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java @@ -1,16 +1,19 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.codec.Base64; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; import com.casic.missiles.model.application.event.core.EventPublisher; import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.event.UserEvent; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.modular.system.redis.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.text.MessageFormat; /** * @ClassName DemoController @@ -24,6 +27,9 @@ @Autowired private EventPublisher publisher; + @Autowired + private RedisUtil redisUtil; + /** * 获取mockToken */ @@ -36,5 +42,29 @@ return ResponseData.success(); } +// /** +// * 燃气压力项目接收数据测试（拓普瑞平台） +// */ +// @PostMapping("/recv") +// @ResponseBody +// public Object recv(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("pressure:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb"); +// System.out.println(encode); +// return ResponseData.success(); +// } +// +// /** +// * 燃气压力项目接收数据测试（电信平台） +// */ +// @PostMapping("/recv2") +// @ResponseBody +// public Object recv2(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("aep:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// return ResponseData.success(); +// } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java index 1eed88c..38a1326 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java @@ -1,23 +1,66 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SnInfoOperateRequest; +import com.casic.missiles.modular.system.enums.OperateTypeEnum; +import com.casic.missiles.modular.system.model.BusQualifyInfo; +import com.casic.missiles.modular.system.service.IBusQualifyInfoService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** - * @Description: 系统配置 + * @Description: 系统配置，资质要求增删查改 * @Author: wangpeng * @Date: 2022/9/26 15:43 */ @RestController @RequestMapping("/sys") -public class SysConfigController { +public class SysConfigController extends ExportController { + @Autowired + private IBusQualifyInfoService qualifyInfoService; /** - * 资质要求 + * 资质要求列表（分页） */ - @PostMapping("/qualify") + @PostMapping("/qualify/listPage") @ResponseBody - public Object list() { - // TODO: 2022/9/26 资质要求增删查改 + public Object listPage(@RequestBody BusQualifyInfo busQualifyInfo) { + Page page = PageFactory.defaultPage(); + List qualifyInfos = qualifyInfoService.getQualifyListPage(page, busQualifyInfo); + page.setRecords(qualifyInfos); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 资质要求列表（不分页） + */ + @PostMapping("/qualify/list") + @ResponseBody + public Object list(@RequestBody BusQualifyInfo busQualifyInfo) { + List qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo); + return ResponseData.success(qualifyInfos); + } + + /** + * 资质要求增删查改 + */ + @PostMapping("/qualify/{operation}") + @ResponseBody + public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody BusQualifyInfo busQualifyInfo) { + if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { + return qualifyInfoService.addQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)) { + return qualifyInfoService.updateQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteBatchQualifyInfo(busQualifyInfo.getIds()); + } return null; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 806de2b..5d9f6d9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -44,10 +44,9 @@ @Autowired private SMSUtil smsUtil; -// @Autowired -// private AbstractUserService userService; - - + /** + * 发送短信验证码 + */ @PostMapping("/sms/send/{phone}") public ResponseData sendMsg(@PathVariable(name = "phone") String phone) { String key = MessageFormat.format(CacheKeys.SMS_TIMEOUT, phone); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java index 248e33e..8285662 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java @@ -18,4 +18,6 @@ public interface AppPushInfoMapper extends BaseMapper { List selectPushInfoList(@Param("page") Page page, @Param("pushInfo") AppPushInfo pushInfo); + + int updateStatusById(@Param("pushInfo") AppPushInfo pushInfo); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java index d5e0c2a..568cde2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java @@ -17,7 +17,7 @@ */ public interface BusCategoryInfoMapper extends BaseMapper { - List selectCategoryInfoListPage(@Param("page") Page page, BusCategoryInfo busCategoryInfo); + List selectCategoryInfoListPage(@Param("page") Page page, @Param("busCategoryInfo") BusCategoryInfo busCategoryInfo); BusCategoryInfo selectCategoryInfo(@Param("categoryCode") String categoryCode); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java new file mode 100644 index 0000000..c43511c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.system.model.BusQualifyInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 资质要求表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2022-10-11 + */ +public interface BusQualifyInfoMapper extends BaseMapper { + + List selectQualifyInfoListPage(@Param("page") Page page, @Param("busQualifyInfo") BusQualifyInfo busQualifyInfo); + + List selectQualifyInfoList(@Param("busQualifyInfo") BusQualifyInfo busQualifyInfo); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml index b6c1595..317d06b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml @@ -4,7 +4,7 @@ id AS id, message_code AS messageCode, message_title AS messageTitle, message_content AS messageContent, - target_users AS targetUsers, create_time AS createTime, update_time AS updateTime + target_users AS targetUsers, message_status AS messageStatus, create_time AS createTime, update_time AS updateTime + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java index 32d9e03..f3e306b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java @@ -50,6 +50,9 @@ public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody AppPushInfo pushInfo) { if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { return pushInfoService.addPushInfo(pushInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)){ + //只更新已读状态 + return pushInfoService.updatePushInfo(pushInfo); }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ return pushInfoService.deletePushInfo(pushInfo); }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ @@ -64,8 +67,8 @@ @PostMapping("/detail") @ResponseBody public Object detail(AppPushInfo pushInfo) { - AppPushInfo pushInfos = pushInfoService.pushInfoDetail(pushInfo); - return ResponseData.success(pushInfos); + AppPushInfo info = pushInfoService.pushInfoDetail(pushInfo); + return ResponseData.success(info); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java index 07e59e3..a7e6b26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java @@ -14,10 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + import java.util.Date; import java.util.Objects; @@ -82,4 +80,11 @@ } } + //根据用户id查用户信息 + @GetMapping("/info") + public Object info(String account) { + User user = this.userService.getByAccount(account); + return ResponseData.success(user); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java index 3f6784b..6546fdf 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.DistributorInfoListResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusDistributorInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,9 +23,22 @@ */ @RestController @RequestMapping("/distributorInfo") -public class BusDistributorInfoController { +public class BusDistributorInfoController extends ExportController { @Autowired private IBusDistributorInfoService distributorInfoService; + + /** + * 经销商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusDistributorInfo distributorInfo) { + List distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), distributorInfoList); + return ResponseData.success(super.packForBT(pages)); + } + /** * 经销商列表（不分页） */ @@ -74,9 +88,17 @@ @PostMapping("/business/detail") @ResponseBody public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) { - String distributorCode = distributorInfo.getDistributorCode(); BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo); return ResponseData.success(detailBusiness); } + /** + * 经销商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody DistributorInfoAddRequest distributorInfoAddRequest) { + return distributorInfoService.add(distributorInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java index fa64dab..a8c2d17 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess; +import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierAnnualAssess") -public class BusSupplierAnnualAssessController { +public class BusSupplierAnnualAssessController extends ExportController { @Autowired private IBusSupplierAnnualAssessService annualAssessService; /** + * 供应商年度考核列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) { + Page page = PageFactory.defaultPage(); + List annualAssessInfoList = annualAssessService.getAnnualAssessInfoList(annualAssess); + page.setRecords(annualAssessInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商年度考核列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java index dcfe4f3..7d8dbff 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java @@ -1,11 +1,16 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest; import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; import com.casic.missiles.modular.system.dto.SupplierInfoListResponse; import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusSupplierInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,11 +26,23 @@ */ @RestController @RequestMapping("/supplierInfo") -public class BusSupplierInfoController { +public class BusSupplierInfoController extends ExportController { @Autowired private IBusSupplierInfoService supplierInfoService; /** + * 供应商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInfo busSupplierInfo) { + List busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busSupplierInfos); + return ResponseData.success(super.packForBT(pages)); + } + + /** * 供应商列表（不分页） */ @PostMapping("/list") @@ -90,4 +107,13 @@ return ResponseData.success(reviewDetailResponse); } + /** + * 供应商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody SupplierInfoAddRequest supplierInfoAddRequest) { + return supplierInfoService.add(supplierInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java index e4f2a13..eba3dc0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; +import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierInputReview") -public class BusSupplierInputReviewController { +public class BusSupplierInputReviewController extends ExportController { @Autowired private IBusSupplierInputReviewService inputReviewService; /** + * 供应商资料录库评审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInputReview inputReview) { + Page page = PageFactory.defaultPage(); + List inputReviewInfoList = inputReviewService.getInputReviewInfoList(inputReview); + page.setRecords(inputReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商资料录库评审列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java index a4e5d70..fa9572a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java @@ -1,6 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusSupplierInfo; import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,9 +24,20 @@ */ @RestController @RequestMapping("/supplierPreReview") -public class BusSupplierPreReviewController { +public class BusSupplierPreReviewController extends ExportController { @Autowired private IBusSupplierPreReviewService preReviewService; + /** + * 供应商资料预审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierPreReview preReview) { + Page page = PageFactory.defaultPage(); + List preReviewInfoList = preReviewService.getPreReviewInfoList(preReview); + page.setRecords(preReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } /** * 供应商资料预审列表（不分页） diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java index 6cbfe1e..278ab5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java @@ -1,5 +1,8 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate; @@ -22,11 +25,23 @@ */ @RestController @RequestMapping("/supplierQuarterlyEvaluate") -public class BusSupplierQuarterlyEvaluateController { +public class BusSupplierQuarterlyEvaluateController extends ExportController { @Autowired private IBusSupplierQuarterlyEvaluateService quarterlyEvaluateService; /** + * 供应商季度评价列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) { + Page page = PageFactory.defaultPage(); + List quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoList(quarterlyEvaluate); + page.setRecords(quarterlyEvaluateList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商季度评价列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java index 3ece5df..61bf830 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java @@ -1,16 +1,19 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.codec.Base64; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; import com.casic.missiles.model.application.event.core.EventPublisher; import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.event.UserEvent; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.modular.system.redis.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.text.MessageFormat; /** * @ClassName DemoController @@ -24,6 +27,9 @@ @Autowired private EventPublisher publisher; + @Autowired + private RedisUtil redisUtil; + /** * 获取mockToken */ @@ -36,5 +42,29 @@ return ResponseData.success(); } +// /** +// * 燃气压力项目接收数据测试（拓普瑞平台） +// */ +// @PostMapping("/recv") +// @ResponseBody +// public Object recv(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("pressure:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb"); +// System.out.println(encode); +// return ResponseData.success(); +// } +// +// /** +// * 燃气压力项目接收数据测试（电信平台） +// */ +// @PostMapping("/recv2") +// @ResponseBody +// public Object recv2(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("aep:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// return ResponseData.success(); +// } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java index 1eed88c..38a1326 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java @@ -1,23 +1,66 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SnInfoOperateRequest; +import com.casic.missiles.modular.system.enums.OperateTypeEnum; +import com.casic.missiles.modular.system.model.BusQualifyInfo; +import com.casic.missiles.modular.system.service.IBusQualifyInfoService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** - * @Description: 系统配置 + * @Description: 系统配置，资质要求增删查改 * @Author: wangpeng * @Date: 2022/9/26 15:43 */ @RestController @RequestMapping("/sys") -public class SysConfigController { +public class SysConfigController extends ExportController { + @Autowired + private IBusQualifyInfoService qualifyInfoService; /** - * 资质要求 + * 资质要求列表（分页） */ - @PostMapping("/qualify") + @PostMapping("/qualify/listPage") @ResponseBody - public Object list() { - // TODO: 2022/9/26 资质要求增删查改 + public Object listPage(@RequestBody BusQualifyInfo busQualifyInfo) { + Page page = PageFactory.defaultPage(); + List qualifyInfos = qualifyInfoService.getQualifyListPage(page, busQualifyInfo); + page.setRecords(qualifyInfos); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 资质要求列表（不分页） + */ + @PostMapping("/qualify/list") + @ResponseBody + public Object list(@RequestBody BusQualifyInfo busQualifyInfo) { + List qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo); + return ResponseData.success(qualifyInfos); + } + + /** + * 资质要求增删查改 + */ + @PostMapping("/qualify/{operation}") + @ResponseBody + public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody BusQualifyInfo busQualifyInfo) { + if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { + return qualifyInfoService.addQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)) { + return qualifyInfoService.updateQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteBatchQualifyInfo(busQualifyInfo.getIds()); + } return null; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 806de2b..5d9f6d9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -44,10 +44,9 @@ @Autowired private SMSUtil smsUtil; -// @Autowired -// private AbstractUserService userService; - - + /** + * 发送短信验证码 + */ @PostMapping("/sms/send/{phone}") public ResponseData sendMsg(@PathVariable(name = "phone") String phone) { String key = MessageFormat.format(CacheKeys.SMS_TIMEOUT, phone); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java index 248e33e..8285662 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java @@ -18,4 +18,6 @@ public interface AppPushInfoMapper extends BaseMapper { List selectPushInfoList(@Param("page") Page page, @Param("pushInfo") AppPushInfo pushInfo); + + int updateStatusById(@Param("pushInfo") AppPushInfo pushInfo); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java index d5e0c2a..568cde2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java @@ -17,7 +17,7 @@ */ public interface BusCategoryInfoMapper extends BaseMapper { - List selectCategoryInfoListPage(@Param("page") Page page, BusCategoryInfo busCategoryInfo); + List selectCategoryInfoListPage(@Param("page") Page page, @Param("busCategoryInfo") BusCategoryInfo busCategoryInfo); BusCategoryInfo selectCategoryInfo(@Param("categoryCode") String categoryCode); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java new file mode 100644 index 0000000..c43511c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.system.model.BusQualifyInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 资质要求表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2022-10-11 + */ +public interface BusQualifyInfoMapper extends BaseMapper { + + List selectQualifyInfoListPage(@Param("page") Page page, @Param("busQualifyInfo") BusQualifyInfo busQualifyInfo); + + List selectQualifyInfoList(@Param("busQualifyInfo") BusQualifyInfo busQualifyInfo); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml index b6c1595..317d06b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml @@ -4,7 +4,7 @@ id AS id, message_code AS messageCode, message_title AS messageTitle, message_content AS messageContent, - target_users AS targetUsers, create_time AS createTime, update_time AS updateTime + target_users AS targetUsers, message_status AS messageStatus, create_time AS createTime, update_time AS updateTime + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java index 32d9e03..f3e306b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java @@ -50,6 +50,9 @@ public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody AppPushInfo pushInfo) { if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { return pushInfoService.addPushInfo(pushInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)){ + //只更新已读状态 + return pushInfoService.updatePushInfo(pushInfo); }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ return pushInfoService.deletePushInfo(pushInfo); }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ @@ -64,8 +67,8 @@ @PostMapping("/detail") @ResponseBody public Object detail(AppPushInfo pushInfo) { - AppPushInfo pushInfos = pushInfoService.pushInfoDetail(pushInfo); - return ResponseData.success(pushInfos); + AppPushInfo info = pushInfoService.pushInfoDetail(pushInfo); + return ResponseData.success(info); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java index 07e59e3..a7e6b26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java @@ -14,10 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + import java.util.Date; import java.util.Objects; @@ -82,4 +80,11 @@ } } + //根据用户id查用户信息 + @GetMapping("/info") + public Object info(String account) { + User user = this.userService.getByAccount(account); + return ResponseData.success(user); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java index 3f6784b..6546fdf 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.DistributorInfoListResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusDistributorInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,9 +23,22 @@ */ @RestController @RequestMapping("/distributorInfo") -public class BusDistributorInfoController { +public class BusDistributorInfoController extends ExportController { @Autowired private IBusDistributorInfoService distributorInfoService; + + /** + * 经销商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusDistributorInfo distributorInfo) { + List distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), distributorInfoList); + return ResponseData.success(super.packForBT(pages)); + } + /** * 经销商列表（不分页） */ @@ -74,9 +88,17 @@ @PostMapping("/business/detail") @ResponseBody public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) { - String distributorCode = distributorInfo.getDistributorCode(); BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo); return ResponseData.success(detailBusiness); } + /** + * 经销商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody DistributorInfoAddRequest distributorInfoAddRequest) { + return distributorInfoService.add(distributorInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java index fa64dab..a8c2d17 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess; +import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierAnnualAssess") -public class BusSupplierAnnualAssessController { +public class BusSupplierAnnualAssessController extends ExportController { @Autowired private IBusSupplierAnnualAssessService annualAssessService; /** + * 供应商年度考核列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) { + Page page = PageFactory.defaultPage(); + List annualAssessInfoList = annualAssessService.getAnnualAssessInfoList(annualAssess); + page.setRecords(annualAssessInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商年度考核列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java index dcfe4f3..7d8dbff 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java @@ -1,11 +1,16 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest; import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; import com.casic.missiles.modular.system.dto.SupplierInfoListResponse; import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusSupplierInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,11 +26,23 @@ */ @RestController @RequestMapping("/supplierInfo") -public class BusSupplierInfoController { +public class BusSupplierInfoController extends ExportController { @Autowired private IBusSupplierInfoService supplierInfoService; /** + * 供应商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInfo busSupplierInfo) { + List busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busSupplierInfos); + return ResponseData.success(super.packForBT(pages)); + } + + /** * 供应商列表（不分页） */ @PostMapping("/list") @@ -90,4 +107,13 @@ return ResponseData.success(reviewDetailResponse); } + /** + * 供应商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody SupplierInfoAddRequest supplierInfoAddRequest) { + return supplierInfoService.add(supplierInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java index e4f2a13..eba3dc0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; +import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierInputReview") -public class BusSupplierInputReviewController { +public class BusSupplierInputReviewController extends ExportController { @Autowired private IBusSupplierInputReviewService inputReviewService; /** + * 供应商资料录库评审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInputReview inputReview) { + Page page = PageFactory.defaultPage(); + List inputReviewInfoList = inputReviewService.getInputReviewInfoList(inputReview); + page.setRecords(inputReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商资料录库评审列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java index a4e5d70..fa9572a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java @@ -1,6 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusSupplierInfo; import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,9 +24,20 @@ */ @RestController @RequestMapping("/supplierPreReview") -public class BusSupplierPreReviewController { +public class BusSupplierPreReviewController extends ExportController { @Autowired private IBusSupplierPreReviewService preReviewService; + /** + * 供应商资料预审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierPreReview preReview) { + Page page = PageFactory.defaultPage(); + List preReviewInfoList = preReviewService.getPreReviewInfoList(preReview); + page.setRecords(preReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } /** * 供应商资料预审列表（不分页） diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java index 6cbfe1e..278ab5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java @@ -1,5 +1,8 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate; @@ -22,11 +25,23 @@ */ @RestController @RequestMapping("/supplierQuarterlyEvaluate") -public class BusSupplierQuarterlyEvaluateController { +public class BusSupplierQuarterlyEvaluateController extends ExportController { @Autowired private IBusSupplierQuarterlyEvaluateService quarterlyEvaluateService; /** + * 供应商季度评价列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) { + Page page = PageFactory.defaultPage(); + List quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoList(quarterlyEvaluate); + page.setRecords(quarterlyEvaluateList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商季度评价列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java index 3ece5df..61bf830 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java @@ -1,16 +1,19 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.codec.Base64; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; import com.casic.missiles.model.application.event.core.EventPublisher; import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.event.UserEvent; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.modular.system.redis.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.text.MessageFormat; /** * @ClassName DemoController @@ -24,6 +27,9 @@ @Autowired private EventPublisher publisher; + @Autowired + private RedisUtil redisUtil; + /** * 获取mockToken */ @@ -36,5 +42,29 @@ return ResponseData.success(); } +// /** +// * 燃气压力项目接收数据测试（拓普瑞平台） +// */ +// @PostMapping("/recv") +// @ResponseBody +// public Object recv(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("pressure:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb"); +// System.out.println(encode); +// return ResponseData.success(); +// } +// +// /** +// * 燃气压力项目接收数据测试（电信平台） +// */ +// @PostMapping("/recv2") +// @ResponseBody +// public Object recv2(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("aep:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// return ResponseData.success(); +// } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java index 1eed88c..38a1326 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java @@ -1,23 +1,66 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SnInfoOperateRequest; +import com.casic.missiles.modular.system.enums.OperateTypeEnum; +import com.casic.missiles.modular.system.model.BusQualifyInfo; +import com.casic.missiles.modular.system.service.IBusQualifyInfoService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** - * @Description: 系统配置 + * @Description: 系统配置，资质要求增删查改 * @Author: wangpeng * @Date: 2022/9/26 15:43 */ @RestController @RequestMapping("/sys") -public class SysConfigController { +public class SysConfigController extends ExportController { + @Autowired + private IBusQualifyInfoService qualifyInfoService; /** - * 资质要求 + * 资质要求列表（分页） */ - @PostMapping("/qualify") + @PostMapping("/qualify/listPage") @ResponseBody - public Object list() { - // TODO: 2022/9/26 资质要求增删查改 + public Object listPage(@RequestBody BusQualifyInfo busQualifyInfo) { + Page page = PageFactory.defaultPage(); + List qualifyInfos = qualifyInfoService.getQualifyListPage(page, busQualifyInfo); + page.setRecords(qualifyInfos); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 资质要求列表（不分页） + */ + @PostMapping("/qualify/list") + @ResponseBody + public Object list(@RequestBody BusQualifyInfo busQualifyInfo) { + List qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo); + return ResponseData.success(qualifyInfos); + } + + /** + * 资质要求增删查改 + */ + @PostMapping("/qualify/{operation}") + @ResponseBody + public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody BusQualifyInfo busQualifyInfo) { + if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { + return qualifyInfoService.addQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)) { + return qualifyInfoService.updateQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteBatchQualifyInfo(busQualifyInfo.getIds()); + } return null; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 806de2b..5d9f6d9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -44,10 +44,9 @@ @Autowired private SMSUtil smsUtil; -// @Autowired -// private AbstractUserService userService; - - + /** + * 发送短信验证码 + */ @PostMapping("/sms/send/{phone}") public ResponseData sendMsg(@PathVariable(name = "phone") String phone) { String key = MessageFormat.format(CacheKeys.SMS_TIMEOUT, phone); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java index 248e33e..8285662 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java @@ -18,4 +18,6 @@ public interface AppPushInfoMapper extends BaseMapper { List selectPushInfoList(@Param("page") Page page, @Param("pushInfo") AppPushInfo pushInfo); + + int updateStatusById(@Param("pushInfo") AppPushInfo pushInfo); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java index d5e0c2a..568cde2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java @@ -17,7 +17,7 @@ */ public interface BusCategoryInfoMapper extends BaseMapper { - List selectCategoryInfoListPage(@Param("page") Page page, BusCategoryInfo busCategoryInfo); + List selectCategoryInfoListPage(@Param("page") Page page, @Param("busCategoryInfo") BusCategoryInfo busCategoryInfo); BusCategoryInfo selectCategoryInfo(@Param("categoryCode") String categoryCode); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java new file mode 100644 index 0000000..c43511c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.system.model.BusQualifyInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 资质要求表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2022-10-11 + */ +public interface BusQualifyInfoMapper extends BaseMapper { + + List selectQualifyInfoListPage(@Param("page") Page page, @Param("busQualifyInfo") BusQualifyInfo busQualifyInfo); + + List selectQualifyInfoList(@Param("busQualifyInfo") BusQualifyInfo busQualifyInfo); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml index b6c1595..317d06b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml @@ -4,7 +4,7 @@ id AS id, message_code AS messageCode, message_title AS messageTitle, message_content AS messageContent, - target_users AS targetUsers, create_time AS createTime, update_time AS updateTime + target_users AS targetUsers, message_status AS messageStatus, create_time AS createTime, update_time AS updateTime + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java index 32d9e03..f3e306b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java @@ -50,6 +50,9 @@ public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody AppPushInfo pushInfo) { if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { return pushInfoService.addPushInfo(pushInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)){ + //只更新已读状态 + return pushInfoService.updatePushInfo(pushInfo); }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ return pushInfoService.deletePushInfo(pushInfo); }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ @@ -64,8 +67,8 @@ @PostMapping("/detail") @ResponseBody public Object detail(AppPushInfo pushInfo) { - AppPushInfo pushInfos = pushInfoService.pushInfoDetail(pushInfo); - return ResponseData.success(pushInfos); + AppPushInfo info = pushInfoService.pushInfoDetail(pushInfo); + return ResponseData.success(info); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java index 07e59e3..a7e6b26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java @@ -14,10 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + import java.util.Date; import java.util.Objects; @@ -82,4 +80,11 @@ } } + //根据用户id查用户信息 + @GetMapping("/info") + public Object info(String account) { + User user = this.userService.getByAccount(account); + return ResponseData.success(user); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java index 3f6784b..6546fdf 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.DistributorInfoListResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusDistributorInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,9 +23,22 @@ */ @RestController @RequestMapping("/distributorInfo") -public class BusDistributorInfoController { +public class BusDistributorInfoController extends ExportController { @Autowired private IBusDistributorInfoService distributorInfoService; + + /** + * 经销商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusDistributorInfo distributorInfo) { + List distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), distributorInfoList); + return ResponseData.success(super.packForBT(pages)); + } + /** * 经销商列表（不分页） */ @@ -74,9 +88,17 @@ @PostMapping("/business/detail") @ResponseBody public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) { - String distributorCode = distributorInfo.getDistributorCode(); BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo); return ResponseData.success(detailBusiness); } + /** + * 经销商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody DistributorInfoAddRequest distributorInfoAddRequest) { + return distributorInfoService.add(distributorInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java index fa64dab..a8c2d17 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess; +import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierAnnualAssess") -public class BusSupplierAnnualAssessController { +public class BusSupplierAnnualAssessController extends ExportController { @Autowired private IBusSupplierAnnualAssessService annualAssessService; /** + * 供应商年度考核列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) { + Page page = PageFactory.defaultPage(); + List annualAssessInfoList = annualAssessService.getAnnualAssessInfoList(annualAssess); + page.setRecords(annualAssessInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商年度考核列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java index dcfe4f3..7d8dbff 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java @@ -1,11 +1,16 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest; import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; import com.casic.missiles.modular.system.dto.SupplierInfoListResponse; import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusSupplierInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,11 +26,23 @@ */ @RestController @RequestMapping("/supplierInfo") -public class BusSupplierInfoController { +public class BusSupplierInfoController extends ExportController { @Autowired private IBusSupplierInfoService supplierInfoService; /** + * 供应商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInfo busSupplierInfo) { + List busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busSupplierInfos); + return ResponseData.success(super.packForBT(pages)); + } + + /** * 供应商列表（不分页） */ @PostMapping("/list") @@ -90,4 +107,13 @@ return ResponseData.success(reviewDetailResponse); } + /** + * 供应商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody SupplierInfoAddRequest supplierInfoAddRequest) { + return supplierInfoService.add(supplierInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java index e4f2a13..eba3dc0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; +import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierInputReview") -public class BusSupplierInputReviewController { +public class BusSupplierInputReviewController extends ExportController { @Autowired private IBusSupplierInputReviewService inputReviewService; /** + * 供应商资料录库评审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInputReview inputReview) { + Page page = PageFactory.defaultPage(); + List inputReviewInfoList = inputReviewService.getInputReviewInfoList(inputReview); + page.setRecords(inputReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商资料录库评审列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java index a4e5d70..fa9572a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java @@ -1,6 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusSupplierInfo; import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,9 +24,20 @@ */ @RestController @RequestMapping("/supplierPreReview") -public class BusSupplierPreReviewController { +public class BusSupplierPreReviewController extends ExportController { @Autowired private IBusSupplierPreReviewService preReviewService; + /** + * 供应商资料预审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierPreReview preReview) { + Page page = PageFactory.defaultPage(); + List preReviewInfoList = preReviewService.getPreReviewInfoList(preReview); + page.setRecords(preReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } /** * 供应商资料预审列表（不分页） diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java index 6cbfe1e..278ab5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java @@ -1,5 +1,8 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate; @@ -22,11 +25,23 @@ */ @RestController @RequestMapping("/supplierQuarterlyEvaluate") -public class BusSupplierQuarterlyEvaluateController { +public class BusSupplierQuarterlyEvaluateController extends ExportController { @Autowired private IBusSupplierQuarterlyEvaluateService quarterlyEvaluateService; /** + * 供应商季度评价列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) { + Page page = PageFactory.defaultPage(); + List quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoList(quarterlyEvaluate); + page.setRecords(quarterlyEvaluateList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商季度评价列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java index 3ece5df..61bf830 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java @@ -1,16 +1,19 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.codec.Base64; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; import com.casic.missiles.model.application.event.core.EventPublisher; import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.event.UserEvent; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.modular.system.redis.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.text.MessageFormat; /** * @ClassName DemoController @@ -24,6 +27,9 @@ @Autowired private EventPublisher publisher; + @Autowired + private RedisUtil redisUtil; + /** * 获取mockToken */ @@ -36,5 +42,29 @@ return ResponseData.success(); } +// /** +// * 燃气压力项目接收数据测试（拓普瑞平台） +// */ +// @PostMapping("/recv") +// @ResponseBody +// public Object recv(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("pressure:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb"); +// System.out.println(encode); +// return ResponseData.success(); +// } +// +// /** +// * 燃气压力项目接收数据测试（电信平台） +// */ +// @PostMapping("/recv2") +// @ResponseBody +// public Object recv2(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("aep:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// return ResponseData.success(); +// } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java index 1eed88c..38a1326 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java @@ -1,23 +1,66 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SnInfoOperateRequest; +import com.casic.missiles.modular.system.enums.OperateTypeEnum; +import com.casic.missiles.modular.system.model.BusQualifyInfo; +import com.casic.missiles.modular.system.service.IBusQualifyInfoService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** - * @Description: 系统配置 + * @Description: 系统配置，资质要求增删查改 * @Author: wangpeng * @Date: 2022/9/26 15:43 */ @RestController @RequestMapping("/sys") -public class SysConfigController { +public class SysConfigController extends ExportController { + @Autowired + private IBusQualifyInfoService qualifyInfoService; /** - * 资质要求 + * 资质要求列表（分页） */ - @PostMapping("/qualify") + @PostMapping("/qualify/listPage") @ResponseBody - public Object list() { - // TODO: 2022/9/26 资质要求增删查改 + public Object listPage(@RequestBody BusQualifyInfo busQualifyInfo) { + Page page = PageFactory.defaultPage(); + List qualifyInfos = qualifyInfoService.getQualifyListPage(page, busQualifyInfo); + page.setRecords(qualifyInfos); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 资质要求列表（不分页） + */ + @PostMapping("/qualify/list") + @ResponseBody + public Object list(@RequestBody BusQualifyInfo busQualifyInfo) { + List qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo); + return ResponseData.success(qualifyInfos); + } + + /** + * 资质要求增删查改 + */ + @PostMapping("/qualify/{operation}") + @ResponseBody + public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody BusQualifyInfo busQualifyInfo) { + if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { + return qualifyInfoService.addQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)) { + return qualifyInfoService.updateQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteBatchQualifyInfo(busQualifyInfo.getIds()); + } return null; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 806de2b..5d9f6d9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -44,10 +44,9 @@ @Autowired private SMSUtil smsUtil; -// @Autowired -// private AbstractUserService userService; - - + /** + * 发送短信验证码 + */ @PostMapping("/sms/send/{phone}") public ResponseData sendMsg(@PathVariable(name = "phone") String phone) { String key = MessageFormat.format(CacheKeys.SMS_TIMEOUT, phone); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java index 248e33e..8285662 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java @@ -18,4 +18,6 @@ public interface AppPushInfoMapper extends BaseMapper { List selectPushInfoList(@Param("page") Page page, @Param("pushInfo") AppPushInfo pushInfo); + + int updateStatusById(@Param("pushInfo") AppPushInfo pushInfo); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java index d5e0c2a..568cde2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java @@ -17,7 +17,7 @@ */ public interface BusCategoryInfoMapper extends BaseMapper { - List selectCategoryInfoListPage(@Param("page") Page page, BusCategoryInfo busCategoryInfo); + List selectCategoryInfoListPage(@Param("page") Page page, @Param("busCategoryInfo") BusCategoryInfo busCategoryInfo); BusCategoryInfo selectCategoryInfo(@Param("categoryCode") String categoryCode); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java new file mode 100644 index 0000000..c43511c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.system.model.BusQualifyInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 资质要求表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2022-10-11 + */ +public interface BusQualifyInfoMapper extends BaseMapper { + + List selectQualifyInfoListPage(@Param("page") Page page, @Param("busQualifyInfo") BusQualifyInfo busQualifyInfo); + + List selectQualifyInfoList(@Param("busQualifyInfo") BusQualifyInfo busQualifyInfo); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml index b6c1595..317d06b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml @@ -4,7 +4,7 @@ id AS id, message_code AS messageCode, message_title AS messageTitle, message_content AS messageContent, - target_users AS targetUsers, create_time AS createTime, update_time AS updateTime + target_users AS targetUsers, message_status AS messageStatus, create_time AS createTime, update_time AS updateTime + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java index 32d9e03..f3e306b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppPushInfoController.java @@ -50,6 +50,9 @@ public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody AppPushInfo pushInfo) { if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { return pushInfoService.addPushInfo(pushInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)){ + //只更新已读状态 + return pushInfoService.updatePushInfo(pushInfo); }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ return pushInfoService.deletePushInfo(pushInfo); }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ @@ -64,8 +67,8 @@ @PostMapping("/detail") @ResponseBody public Object detail(AppPushInfo pushInfo) { - AppPushInfo pushInfos = pushInfoService.pushInfoDetail(pushInfo); - return ResponseData.success(pushInfos); + AppPushInfo info = pushInfoService.pushInfoDetail(pushInfo); + return ResponseData.success(info); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java index 07e59e3..a7e6b26 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AppUserController.java @@ -14,10 +14,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + import java.util.Date; import java.util.Objects; @@ -82,4 +80,11 @@ } } + //根据用户id查用户信息 + @GetMapping("/info") + public Object info(String account) { + User user = this.userService.getByAccount(account); + return ResponseData.success(user); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java index 3f6784b..6546fdf 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusDistributorInfoController.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.DistributorInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.DistributorInfoListResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; -import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; +import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusDistributorInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,9 +23,22 @@ */ @RestController @RequestMapping("/distributorInfo") -public class BusDistributorInfoController { +public class BusDistributorInfoController extends ExportController { @Autowired private IBusDistributorInfoService distributorInfoService; + + /** + * 经销商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusDistributorInfo distributorInfo) { + List distributorInfoList = distributorInfoService.getDistributorInfoList(distributorInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), distributorInfoList); + return ResponseData.success(super.packForBT(pages)); + } + /** * 经销商列表（不分页） */ @@ -74,9 +88,17 @@ @PostMapping("/business/detail") @ResponseBody public Object businessDetail(@RequestBody BusDistributorInfo distributorInfo) { - String distributorCode = distributorInfo.getDistributorCode(); BusDetailBusiness detailBusiness = distributorInfoService.getDistributorBusinessDetail(distributorInfo); return ResponseData.success(detailBusiness); } + /** + * 经销商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody DistributorInfoAddRequest distributorInfoAddRequest) { + return distributorInfoService.add(distributorInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java index fa64dab..a8c2d17 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierAnnualAssessController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierAnnualAssess; +import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.service.IBusSupplierAnnualAssessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierAnnualAssess") -public class BusSupplierAnnualAssessController { +public class BusSupplierAnnualAssessController extends ExportController { @Autowired private IBusSupplierAnnualAssessService annualAssessService; /** + * 供应商年度考核列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierAnnualAssess annualAssess) { + Page page = PageFactory.defaultPage(); + List annualAssessInfoList = annualAssessService.getAnnualAssessInfoList(annualAssess); + page.setRecords(annualAssessInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商年度考核列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java index dcfe4f3..7d8dbff 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInfoController.java @@ -1,11 +1,16 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SupplierInfoAddRequest; import com.casic.missiles.modular.system.dto.SupplierInfoBaseDetailResponse; import com.casic.missiles.modular.system.dto.SupplierInfoListResponse; import com.casic.missiles.modular.system.dto.SupplierInfoReviewDetailResponse; import com.casic.missiles.modular.system.model.*; import com.casic.missiles.modular.system.service.IBusSupplierInfoService; +import com.casic.missiles.modular.system.util.PageUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,11 +26,23 @@ */ @RestController @RequestMapping("/supplierInfo") -public class BusSupplierInfoController { +public class BusSupplierInfoController extends ExportController { @Autowired private IBusSupplierInfoService supplierInfoService; /** + * 供应商列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInfo busSupplierInfo) { + List busSupplierInfos = supplierInfoService.getSupplierInfoList(busSupplierInfo); + Page page = PageFactory.defaultPage(); + Page pages = PageUtil.getPages((int) page.getCurrent(), (int) page.getSize(), busSupplierInfos); + return ResponseData.success(super.packForBT(pages)); + } + + /** * 供应商列表（不分页） */ @PostMapping("/list") @@ -90,4 +107,13 @@ return ResponseData.success(reviewDetailResponse); } + /** + * 供应商-信息填报 + */ + @PostMapping("/add") + @ResponseBody + public Object add(@RequestBody SupplierInfoAddRequest supplierInfoAddRequest) { + return supplierInfoService.add(supplierInfoAddRequest); + } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java index e4f2a13..eba3dc0 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierInputReviewController.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; +import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierInputReviewService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,11 +24,23 @@ */ @RestController @RequestMapping("/supplierInputReview") -public class BusSupplierInputReviewController { +public class BusSupplierInputReviewController extends ExportController { @Autowired private IBusSupplierInputReviewService inputReviewService; /** + * 供应商资料录库评审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierInputReview inputReview) { + Page page = PageFactory.defaultPage(); + List inputReviewInfoList = inputReviewService.getInputReviewInfoList(inputReview); + page.setRecords(inputReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商资料录库评审列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java index a4e5d70..fa9572a 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierPreReviewController.java @@ -1,6 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.model.BusSupplierInfo; import com.casic.missiles.modular.system.model.BusSupplierPreReview; import com.casic.missiles.modular.system.service.IBusSupplierPreReviewService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,9 +24,20 @@ */ @RestController @RequestMapping("/supplierPreReview") -public class BusSupplierPreReviewController { +public class BusSupplierPreReviewController extends ExportController { @Autowired private IBusSupplierPreReviewService preReviewService; + /** + * 供应商资料预审列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierPreReview preReview) { + Page page = PageFactory.defaultPage(); + List preReviewInfoList = preReviewService.getPreReviewInfoList(preReview); + page.setRecords(preReviewInfoList); + return ResponseData.success(super.packForBT(page)); + } /** * 供应商资料预审列表（不分页） diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java index 6cbfe1e..278ab5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusSupplierQuarterlyEvaluateController.java @@ -1,5 +1,8 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.BusSupplierInputReview; import com.casic.missiles.modular.system.model.BusSupplierQuarterlyEvaluate; @@ -22,11 +25,23 @@ */ @RestController @RequestMapping("/supplierQuarterlyEvaluate") -public class BusSupplierQuarterlyEvaluateController { +public class BusSupplierQuarterlyEvaluateController extends ExportController { @Autowired private IBusSupplierQuarterlyEvaluateService quarterlyEvaluateService; /** + * 供应商季度评价列表（分页） + */ + @PostMapping("/listPage") + @ResponseBody + public Object listPage(@RequestBody BusSupplierQuarterlyEvaluate quarterlyEvaluate) { + Page page = PageFactory.defaultPage(); + List quarterlyEvaluateList = quarterlyEvaluateService.getQuarterlyEvaluateInfoList(quarterlyEvaluate); + page.setRecords(quarterlyEvaluateList); + return ResponseData.success(super.packForBT(page)); + } + + /** * 供应商季度评价列表（不分页） */ @PostMapping("/list") diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java index 3ece5df..61bf830 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DemoController.java @@ -1,16 +1,19 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.codec.Base64; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; import com.casic.missiles.model.application.event.core.EventPublisher; import com.casic.missiles.model.application.event.enums.ModelEventTypeEnum; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.event.UserEvent; import com.casic.missiles.modular.system.model.User; +import com.casic.missiles.modular.system.redis.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.text.MessageFormat; /** * @ClassName DemoController @@ -24,6 +27,9 @@ @Autowired private EventPublisher publisher; + @Autowired + private RedisUtil redisUtil; + /** * 获取mockToken */ @@ -36,5 +42,29 @@ return ResponseData.success(); } +// /** +// * 燃气压力项目接收数据测试（拓普瑞平台） +// */ +// @PostMapping("/recv") +// @ResponseBody +// public Object recv(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("pressure:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// String encode = Base64.encode("6826a515d93a4b33aa945958cf7c1112:" + "a7e4927074854649be1bb4fea1cac1cb"); +// System.out.println(encode); +// return ResponseData.success(); +// } +// +// /** +// * 燃气压力项目接收数据测试（电信平台） +// */ +// @PostMapping("/recv2") +// @ResponseBody +// public Object recv2(@RequestBody JSONObject jsonObject) { +// String key = MessageFormat.format("aep:data:{0}", DateUtil.now()); +// redisUtil.set(key, JSONObject.toJSONString(jsonObject)); +// return ResponseData.success(); +// } + } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java index 1eed88c..38a1326 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/SysConfigController.java @@ -1,23 +1,66 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.SnInfoOperateRequest; +import com.casic.missiles.modular.system.enums.OperateTypeEnum; +import com.casic.missiles.modular.system.model.BusQualifyInfo; +import com.casic.missiles.modular.system.service.IBusQualifyInfoService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** - * @Description: 系统配置 + * @Description: 系统配置，资质要求增删查改 * @Author: wangpeng * @Date: 2022/9/26 15:43 */ @RestController @RequestMapping("/sys") -public class SysConfigController { +public class SysConfigController extends ExportController { + @Autowired + private IBusQualifyInfoService qualifyInfoService; /** - * 资质要求 + * 资质要求列表（分页） */ - @PostMapping("/qualify") + @PostMapping("/qualify/listPage") @ResponseBody - public Object list() { - // TODO: 2022/9/26 资质要求增删查改 + public Object listPage(@RequestBody BusQualifyInfo busQualifyInfo) { + Page page = PageFactory.defaultPage(); + List qualifyInfos = qualifyInfoService.getQualifyListPage(page, busQualifyInfo); + page.setRecords(qualifyInfos); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 资质要求列表（不分页） + */ + @PostMapping("/qualify/list") + @ResponseBody + public Object list(@RequestBody BusQualifyInfo busQualifyInfo) { + List qualifyInfos = qualifyInfoService.getQualifyList(busQualifyInfo); + return ResponseData.success(qualifyInfos); + } + + /** + * 资质要求增删查改 + */ + @PostMapping("/qualify/{operation}") + @ResponseBody + public Object operation(@PathVariable(name = "operation") String operateType, @RequestBody BusQualifyInfo busQualifyInfo) { + if(OperateTypeEnum.ADD.getOperateType().equals(operateType)) { + return qualifyInfoService.addQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.UPDATE.getOperateType().equals(operateType)) { + return qualifyInfoService.updateQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.DELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteQualifyInfo(busQualifyInfo); + }else if(OperateTypeEnum.BATCHDELETE.getOperateType().equals(operateType)){ + return qualifyInfoService.deleteBatchQualifyInfo(busQualifyInfo.getIds()); + } return null; } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java index 806de2b..5d9f6d9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/UserController.java @@ -44,10 +44,9 @@ @Autowired private SMSUtil smsUtil; -// @Autowired -// private AbstractUserService userService; - - + /** + * 发送短信验证码 + */ @PostMapping("/sms/send/{phone}") public ResponseData sendMsg(@PathVariable(name = "phone") String phone) { String key = MessageFormat.format(CacheKeys.SMS_TIMEOUT, phone); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java index 248e33e..8285662 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/AppPushInfoMapper.java @@ -18,4 +18,6 @@ public interface AppPushInfoMapper extends BaseMapper { List selectPushInfoList(@Param("page") Page page, @Param("pushInfo") AppPushInfo pushInfo); + + int updateStatusById(@Param("pushInfo") AppPushInfo pushInfo); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java index d5e0c2a..568cde2 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusCategoryInfoMapper.java @@ -17,7 +17,7 @@ */ public interface BusCategoryInfoMapper extends BaseMapper { - List selectCategoryInfoListPage(@Param("page") Page page, BusCategoryInfo busCategoryInfo); + List selectCategoryInfoListPage(@Param("page") Page page, @Param("busCategoryInfo") BusCategoryInfo busCategoryInfo); BusCategoryInfo selectCategoryInfo(@Param("categoryCode") String categoryCode); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java new file mode 100644 index 0000000..c43511c --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusQualifyInfoMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.system.model.BusQualifyInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 资质要求表 Mapper 接口 + *

+ * + * @author wangpeng + * @since 2022-10-11 + */ +public interface BusQualifyInfoMapper extends BaseMapper { + + List selectQualifyInfoListPage(@Param("page") Page page, @Param("busQualifyInfo") BusQualifyInfo busQualifyInfo); + + List selectQualifyInfoList(@Param("busQualifyInfo") BusQualifyInfo busQualifyInfo); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml index b6c1595..317d06b 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/AppPushInfoMapper.xml @@ -4,7 +4,7 @@ id AS id, message_code AS messageCode, message_title AS messageTitle, message_content AS messageContent, - target_users AS targetUsers, create_time AS createTime, update_time AS updateTime + target_users AS targetUsers, message_status AS messageStatus, create_time AS createTime, update_time AS updateTime + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress + + + UPDATE app_push_info + SET message_status = #{pushInfo.messageStatus} + WHERE id = #{pushInfo.id} + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml index 4ef3787..65f7e59 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceCookerHoodInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_cooker_hood_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml index 0667843..a913428 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceGasStoveInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_gas_stove_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml index 7c553f3..f20da5f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHangingFurnaceInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_hanging_furnace_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml index 387fdfc..574c78c 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceHeaterInfoMapper.xml @@ -6,5 +6,7 @@ SELECT * FROM bus_device_heater_info WHERE device_id = #{deviceId} + ORDER BY update_time DESC + limit 1 diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml index c21f5eb..a4715e5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusDeviceInfoMapper.xml @@ -23,25 +23,24 @@ and brand_name = #{busDeviceInfo.brandName} - + and device_status = #{busDeviceInfo.deviceStatus} - + and device_bind_user = #{busDeviceInfo.deviceBindUser} - UPDATE bus_device_info - SET device_bind_user = 0 - WHERE device_id IN - - #{deviceId} + + UPDATE bus_device_info + SET device_bind_user = 0 + WHERE device_id = #{deviceId} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml new file mode 100644 index 0000000..1a648d9 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusQualifyInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml index 3d257cb..fcca0f9 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusServiceInfoMapper.xml @@ -16,7 +16,7 @@ and service_name like concat('%',#{busServiceInfo.serviceName},'%') - + and type_code like concat('%',#{busServiceInfo.typeCode},'%') diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml index 9bb5af1..608b4c5 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusSupplierInfoMapper.xml @@ -3,16 +3,16 @@ - supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, + id AS id, supplier_code AS supplierCode, supplier_name AS supplierName, supplier_status AS supplierStatus, supplier_status_name AS supplierStatusName, pre_review_result AS preReviewResult, input_review_result AS inputReviewResult, - latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult, + latest_quarterly_evaluate_result AS latestQuarterlyEvaluateResult, latest_annual_assess_result AS latestAnnualAssessResult supplier_code AS supplierCode, supplier_name AS supplierName, supplier_area AS supplierArea, supplier_area_name AS supplierAreaName, company_nature AS companyNature, company_nature_name AS companyNatureName, company_type AS companyType, company_type_name AS companyTypeName, company_province AS companyProvince, - company_city AS companyCity, company_area AS companyArea, companyAddress AS company_address + company_city AS companyCity, company_area AS companyArea, company_address AS companyAddress