feats

src/main/java/com/yunzhi/marketing/controller/TaBuildingProjectTypeController.java

@@ -4,11 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.entity.TaBuildingProjectType;
+import com.yunzhi.marketing.entity.TdBuildingType;
 import com.yunzhi.marketing.service.ITaBuildingProjectTypeService;
 import com.yunzhi.marketing.service.ITaPersonBuildingService;
 import com.yunzhi.marketing.service.ITaPersonService;
 import com.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.service.ITdBuildingTypeService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +46,9 @@ public class TaBuildingProjectTypeController extends BaseController {
     @Autowired
     private ITaPersonService iTaPersonService;
 
+    @Autowired
+    private ITdBuildingTypeService iTdBuildingTypeService;
+
 
     /**
      * 分页查询列表
@@ -78,6 +84,11 @@ public class TaBuildingProjectTypeController extends BaseController {
     public ResponseBean taBuildingProjectTypeAdd(@RequestBody TaBuildingProjectType taBuildingProjectType){
         ResponseBean responseBean = new ResponseBean();
         try {
+            TdBuildingType dict = iTdBuildingTypeService.getById(taBuildingProjectType.getBuildingTypeId());
+            if (dict != null) {
+                taBuildingProjectType.setBuildingTypeName(dict.getBuildingTypeName());
+            }
+
             if (iTaBuildingProjectTypeService.save(taBuildingProjectType)){
                 responseBean.addSuccess(taBuildingProjectType);
             }else {
@@ -122,6 +133,11 @@ public class TaBuildingProjectTypeController extends BaseController {
                                         @RequestBody TaBuildingProjectType taBuildingProjectType){
         ResponseBean responseBean = new ResponseBean();
         try {
+            TdBuildingType dict = iTdBuildingTypeService.getById(taBuildingProjectType.getBuildingTypeId());
+            if (dict != null) {
+                taBuildingProjectType.setBuildingTypeName(dict.getBuildingTypeName());
+            }
+
             if (iTaBuildingProjectTypeService.updateById(taBuildingProjectType)){
                 responseBean.addSuccess(taBuildingProjectType);
             }else {

src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ spring:
   datasource:
     username: marketing
     password: u@cSFJ5*kS9hGP7a
-    url: jdbc:mysql://localhost:3306/marketing-cloud?useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://210.13.107.60:3306/marketing-cloud?useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.cj.jdbc.Driver
     initial-size: 10 # 初始化连接数
     max-active: 20 # 最大连接数