From 5f6351fc25827bc96d23a613b85544ffe1109a64 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Mon, 7 Nov 2022 17:07:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=95=E6=8D=AE=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E8=AE=BE=E7=BD=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api-admin/pom.xml | 6 +- .../basic/BasicBusTypeChangeController.java | 92 +++++++++++++++++++ .../purechase/SupCompanyController.java | 2 +- .../dao/basic/BasicBusTypeChangeDao.java | 25 +++++ .../basic/BasicBusTypeChangeEntity.java | 23 +++++ .../req/basic/BasicBusTypeChangeRequest.java | 13 +++ .../res/basic/BasicBusTypeChangeResponse.java | 10 ++ .../basic/BasicBusTypeChangeService.java | 24 +++++ .../impl/BasicBusTypeChangeServiceImpl.java | 75 +++++++++++++++ .../main/resources/application-dev.properties | 2 +- .../main/resources/application-pro.properties | 4 +- .../src/main/resources/application.properties | 2 +- .../mapper/basic/BasicBusTypeChangeDao.xml | 80 ++++++++++++++++ 13 files changed, 350 insertions(+), 8 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicBusTypeChangeController.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BasicBusTypeChangeDao.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BasicBusTypeChangeEntity.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicBusTypeChangeRequest.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/res/basic/BasicBusTypeChangeResponse.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/service/basic/BasicBusTypeChangeService.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicBusTypeChangeServiceImpl.java create mode 100644 api-admin/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml diff --git a/api-admin/pom.xml b/api-admin/pom.xml index 7c824a1..2049999 100644 --- a/api-admin/pom.xml +++ b/api-admin/pom.xml @@ -351,9 +351,9 @@ pro - - true - + + + diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicBusTypeChangeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicBusTypeChangeController.java new file mode 100644 index 0000000..afbe9f4 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BasicBusTypeChangeController.java @@ -0,0 +1,92 @@ +package com.glxp.sale.admin.controller.basic; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; +import com.glxp.sale.admin.entity.basic.BasicBusTypeChangeEntity; +import com.glxp.sale.admin.req.basic.BasicBusTypeChangeRequest; +import com.glxp.sale.admin.req.info.DeleteRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.res.basic.BasicBusTypeChangeResponse; +import com.glxp.sale.admin.service.basic.BasicBusTypeChangeService; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.Date; +import java.util.List; + +@RestController +public class BasicBusTypeChangeController { + + @Resource + BasicBusTypeChangeService basicBusTypeChangeService; + + + @AuthRuleAnnotation("") + @GetMapping("/basic/bustype/change/filter") + public BaseResponse filterJoinList(BasicBusTypeChangeRequest basicBusTypeChangeRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List basicBusTypeChangeEntities; + basicBusTypeChangeEntities = basicBusTypeChangeService.filterJoinList( + basicBusTypeChangeRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(basicBusTypeChangeEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(basicBusTypeChangeEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @PostMapping("/basic/bustype/change/insert") + public BaseResponse insertBusType(@RequestBody @Valid BasicBusTypeChangeEntity basicBusTypeChangeEntity, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + basicBusTypeChangeEntity.setUpdateTime(new Date()); + basicBusTypeChangeService.insertBusType(basicBusTypeChangeEntity); + return ResultVOUtils.success("更新成功"); + } + + @PostMapping("/basic/bustype/change/update") + public BaseResponse updateBusType(@RequestBody @Valid BasicBusTypeChangeEntity basicBusTypeChangeEntity, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + basicBusTypeChangeEntity.setUpdateTime(new Date()); + basicBusTypeChangeService.updateBasicBusTypeChange(basicBusTypeChangeEntity); + return ResultVOUtils.success("更新成功"); + } + + + @PostMapping("/basic/bustype/change/delete") + public BaseResponse delBussinessType(@RequestBody DeleteRequest deleteRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (deleteRequest != null) { + basicBusTypeChangeService.deleteById(deleteRequest.getId()); + } else { + return ResultVOUtils.error(999, "参数错误"); + } + return ResultVOUtils.success("更新成功"); + } + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java index a961c7e..eca5c41 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java @@ -106,7 +106,7 @@ public class SupCompanyController { @PostMapping("/api/pur/modifyCompany") public BaseResponse modifyCompany(@RequestBody SupCompanyEntity companyEntity) { - if (companyEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) { + if (companyEntity.getAuditStatus() == ConstantStatus.AUDIT_UN || companyEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE) { //提交审核 FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); filterCertSetsRequest.setType(ConstantStatus.CERT_COMPANY); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BasicBusTypeChangeDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BasicBusTypeChangeDao.java new file mode 100644 index 0000000..d9e8501 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BasicBusTypeChangeDao.java @@ -0,0 +1,25 @@ +package com.glxp.sale.admin.dao.basic; + +import com.glxp.sale.admin.entity.basic.BasicBusTypeChangeEntity; +import com.glxp.sale.admin.req.basic.BasicBusTypeChangeRequest; +import com.glxp.sale.admin.res.basic.BasicBusTypeChangeResponse; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BasicBusTypeChangeDao { + + + List filterList(BasicBusTypeChangeRequest basicBusTypeChangeRequest); + + List filterJoinList(BasicBusTypeChangeRequest basicBusTypeChangeRequest); + + boolean insertBusType(BasicBusTypeChangeEntity basicBusTypeChangeEntity); + + boolean updateBasicBusTypeChange(BasicBusTypeChangeEntity basicBusTypeChangeEntity); + + boolean deleteById(@Param("id") String id); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BasicBusTypeChangeEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BasicBusTypeChangeEntity.java new file mode 100644 index 0000000..b30a563 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BasicBusTypeChangeEntity.java @@ -0,0 +1,23 @@ +package com.glxp.sale.admin.entity.basic; + +import lombok.Data; + +import java.util.Date; + +@Data +public class BasicBusTypeChangeEntity { + + private Integer id; + private String originAction; + private String originName; + private String targetBusAction; + private String targetScAction; + private Integer type; + private Date updateTime; + private String remark; + private boolean enable; + + + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicBusTypeChangeRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicBusTypeChangeRequest.java new file mode 100644 index 0000000..b37c3c9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BasicBusTypeChangeRequest.java @@ -0,0 +1,13 @@ +package com.glxp.sale.admin.req.basic; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class BasicBusTypeChangeRequest extends ListPageRequest { + + private String originAction; + private Boolean enable; + private Integer type; + private String lastUpdateTime; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BasicBusTypeChangeResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BasicBusTypeChangeResponse.java new file mode 100644 index 0000000..746406c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BasicBusTypeChangeResponse.java @@ -0,0 +1,10 @@ +package com.glxp.sale.admin.res.basic; + +import com.glxp.sale.admin.entity.basic.BasicBusTypeChangeEntity; +import lombok.Data; + +@Data +public class BasicBusTypeChangeResponse extends BasicBusTypeChangeEntity { + + private String targetBusName; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BasicBusTypeChangeService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BasicBusTypeChangeService.java new file mode 100644 index 0000000..582769d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BasicBusTypeChangeService.java @@ -0,0 +1,24 @@ +package com.glxp.sale.admin.service.basic; + +import com.glxp.sale.admin.entity.basic.BasicBusTypeChangeEntity; +import com.glxp.sale.admin.req.basic.BasicBusTypeChangeRequest; +import com.glxp.sale.admin.res.basic.BasicBusTypeChangeResponse; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public interface BasicBusTypeChangeService { + + BasicBusTypeChangeEntity findByAction(String action); + + List filterJoinList(BasicBusTypeChangeRequest basicBusTypeChangeRequest); + + boolean insertBusType(BasicBusTypeChangeEntity basicBusTypeChangeEntity); + + List filterList(BasicBusTypeChangeRequest basicBusTypeChangeRequest); + + boolean updateBasicBusTypeChange(BasicBusTypeChangeEntity basicBusTypeChangeEntity); + + boolean deleteById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicBusTypeChangeServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicBusTypeChangeServiceImpl.java new file mode 100644 index 0000000..5fe59ad --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicBusTypeChangeServiceImpl.java @@ -0,0 +1,75 @@ +package com.glxp.sale.admin.service.basic.impl; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.basic.BasicBusTypeChangeDao; +import com.glxp.sale.admin.entity.basic.BasicBusTypeChangeEntity; +import com.glxp.sale.admin.req.basic.BasicBusTypeChangeRequest; +import com.glxp.sale.admin.res.basic.BasicBusTypeChangeResponse; +import com.glxp.sale.admin.service.basic.BasicBusTypeChangeService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class BasicBusTypeChangeServiceImpl implements BasicBusTypeChangeService { + + @Resource + BasicBusTypeChangeDao basicBusTypeChangeDao; + + @Override + public BasicBusTypeChangeEntity findByAction(String action) { + + if (StrUtil.isNotEmpty(action)) { + BasicBusTypeChangeRequest basicBusTypeChangeRequest = new BasicBusTypeChangeRequest(); + basicBusTypeChangeRequest.setOriginAction(action); + List basicBusTypeChangeEntities = basicBusTypeChangeDao.filterList(basicBusTypeChangeRequest); + if (CollUtil.isNotEmpty(basicBusTypeChangeEntities)) { + return basicBusTypeChangeEntities.get(0); + } + } + return null; + } + + @Override + public List filterJoinList(BasicBusTypeChangeRequest basicBusTypeChangeRequest) { + if (basicBusTypeChangeRequest == null) { + return Collections.emptyList(); + } + if (basicBusTypeChangeRequest.getPage() != null) { + int offset = (basicBusTypeChangeRequest.getPage() - 1) * basicBusTypeChangeRequest.getLimit(); + PageHelper.offsetPage(offset, basicBusTypeChangeRequest.getLimit()); + } + return basicBusTypeChangeDao.filterJoinList(basicBusTypeChangeRequest); + } + + @Override + public boolean insertBusType(BasicBusTypeChangeEntity basicBusTypeChangeEntity) { + return basicBusTypeChangeDao.insertBusType(basicBusTypeChangeEntity); + } + + @Override + public List filterList(BasicBusTypeChangeRequest basicBusTypeChangeRequest) { + if (basicBusTypeChangeRequest == null) { + return Collections.emptyList(); + } + if (basicBusTypeChangeRequest.getPage() != null) { + int offset = (basicBusTypeChangeRequest.getPage() - 1) * basicBusTypeChangeRequest.getLimit(); + PageHelper.offsetPage(offset, basicBusTypeChangeRequest.getLimit()); + } + return basicBusTypeChangeDao.filterList(basicBusTypeChangeRequest); + } + + @Override + public boolean updateBasicBusTypeChange(BasicBusTypeChangeEntity basicBusTypeChangeEntity) { + return basicBusTypeChangeDao.updateBasicBusTypeChange(basicBusTypeChangeEntity); + } + + @Override + public boolean deleteById(String id) { + return basicBusTypeChangeDao.deleteById(id); + } +} diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index d3db546..62b651c 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -1,7 +1,7 @@ # \u751F\u4EA7\u73AF\u5883 server.port=9906 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_za?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.jdbc-url=jdbc:mysql://192.168.0.55:3306/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root spring.datasource.password=123456 spring.datasource.hikari.connection-timeout=60000 diff --git a/api-admin/src/main/resources/application-pro.properties b/api-admin/src/main/resources/application-pro.properties index 3b2734a..9dcdab9 100644 --- a/api-admin/src/main/resources/application-pro.properties +++ b/api-admin/src/main/resources/application-pro.properties @@ -1,9 +1,9 @@ # \u751F\u4EA7\u73AF\u5883 server.port=9996 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.jdbc-url=jdbc:mysql://192.168.0.55:3306/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root -spring.datasource.password=Glxp@6066 +spring.datasource.password=123456 spring.datasource.hikari.connection-timeout=60000 spring.datasource.hikari.maximum-pool-size=60 spring.datasource.hikari.minimum-idle=10 diff --git a/api-admin/src/main/resources/application.properties b/api-admin/src/main/resources/application.properties index cb3acd2..0f5d7b4 100644 --- a/api-admin/src/main/resources/application.properties +++ b/api-admin/src/main/resources/application.properties @@ -1,4 +1,4 @@ -spring.profiles.active=test1 +spring.profiles.active=pro spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml new file mode 100644 index 0000000..fb95daf --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + insert + INTO basic_bustype_change + (`originAction`, originName, `targetBusAction`, targetScAction, `type`, updateTime, remark, enable) + values (#{originAction}, + #{originName}, + #{targetBusAction}, + #{targetScAction}, + #{type}, #{updateTime}, #{remark}, #{enable}) + + + + UPDATE basic_bustype_change + + originAction = #{originAction}, + originName = #{originName}, + enable = #{enable}, + targetBusAction = #{targetBusAction}, + targetScAction = #{targetScAction}, + remark = #{remark}, + updateTime = #{updateTime}, + `type` = #{type}, + + WHERE id = #{id} + + + + DELETE + FROM basic_bustype_change + WHERE id = #{id} + + + \ No newline at end of file