feats

src/main/java/com/yunzhi/marketing/entity/TaBuilding.java

@@ -375,6 +375,9 @@ public class TaBuilding implements Serializable {
     /** 是否文旅商办 */
     private Integer isCommerce ;
 
+    /** 是否文旅商办 */
+    private Integer isRecentOpening ;
+
     /**
      * 项目亮点封面
      */

src/main/java/com/yunzhi/marketing/xlk/controller/BuildingChannelController.java

@@ -1,9 +1,6 @@
 package com.yunzhi.marketing.xlk.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-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.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.xlk.dto.BuildingChannelDTO;
@@ -21,6 +18,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -40,7 +38,6 @@ public class BuildingChannelController extends BaseController {
     @Autowired
     public IBuildingChannelService iBuildingChannelService;
 
-
     /**
      * 保存对象
      * @param buildingChannelDTO 实体对象
@@ -53,18 +50,7 @@ public class BuildingChannelController extends BaseController {
                                            HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            Integer orgId = getOrgId(request);
-            List<BuildingChannel> buildingChannelList = new ArrayList<>();
-            List<String> channelIdList = buildingChannelDTO.getChannelIdList();
-            channelIdList.forEach(e -> {
-                BuildingChannel buildingChannel = new BuildingChannel();
-                BeanUtils.copyProperties(e,buildingChannel);
-                buildingChannel.setChannelId(e);
-                buildingChannel.setCreateDate(LocalDateTime.now());
-                buildingChannel.setOrgId(orgId);
-                buildingChannelList.add(buildingChannel);
-            });
-            if (iBuildingChannelService.saveBatch(buildingChannelList)){
+            if (saveData(buildingChannelDTO, getOrgId(request))){
                 responseBean.addSuccess("添加成功");
             }else {
                 responseBean.addError("fail");
@@ -93,18 +79,7 @@ public class BuildingChannelController extends BaseController {
             iBuildingChannelService.remove(new LambdaQueryWrapper<BuildingChannel>().eq(BuildingChannel::getBuildingId,buildingChannelDTO.getBuildingId()));
 
             // 重新添加
-            Integer orgId = getOrgId(request);
-            List<BuildingChannel> buildingChannelList = new ArrayList<>();
-            List<String> channelIdList = buildingChannelDTO.getChannelIdList();
-            channelIdList.forEach(e -> {
-                BuildingChannel buildingChannel = new BuildingChannel();
-                BeanUtils.copyProperties(e,buildingChannel);
-                buildingChannel.setChannelId(e);
-                buildingChannel.setCreateDate(LocalDateTime.now());
-                buildingChannel.setOrgId(orgId);
-                buildingChannelList.add(buildingChannel);
-            });
-            if (iBuildingChannelService.saveBatch(buildingChannelList)){
+            if (saveData(buildingChannelDTO, getOrgId(request))){
                 responseBean.addSuccess("修改成功");
             }else {
                 responseBean.addError("fail");
@@ -117,6 +92,24 @@ public class BuildingChannelController extends BaseController {
         return responseBean;
     }
 
+    private boolean saveData(BuildingChannelDTO buildingChannelDTO, Integer orgId) {
+        List<BuildingChannel> buildingChannelList = new ArrayList<>();
+        List<String> channelIdList = buildingChannelDTO.getChannelIdList();
+        channelIdList.forEach(e -> {
+            BuildingChannel buildingChannel = new BuildingChannel();
+            BeanUtils.copyProperties(e,buildingChannel);
+            buildingChannel.setChannelId(e);
+            buildingChannel.setBuildingId(buildingChannelDTO.getBuildingId());
+            buildingChannel.setExpirationDate(buildingChannelDTO.getExpirationDate());
+            buildingChannel.setRemark(buildingChannelDTO.getRemark());
+            buildingChannel.setCreateDate(LocalDateTime.now());
+            buildingChannel.setOrgId(orgId);
+            buildingChannelList.add(buildingChannel);
+        });
+
+        return iBuildingChannelService.saveBatch(buildingChannelList);
+    }
+
     /**
      * 根据id查询对象
      * @param
@@ -129,7 +122,17 @@ public class BuildingChannelController extends BaseController {
             LambdaQueryWrapper<BuildingChannel> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(BuildingChannel::getBuildingId,buildingId);
             List<BuildingChannel> list = iBuildingChannelService.list(queryWrapper);
-            responseBean.addSuccess(list);
+
+            BuildingChannelDTO buildingChannelDTO = null;
+            if (list != null && list.size() > 0) {
+                buildingChannelDTO = new BuildingChannelDTO();
+                buildingChannelDTO.setChannelIdList(list.stream().map(x -> x.getChannelId()).collect(Collectors.toList()));
+                buildingChannelDTO.setBuildingId(buildingId);
+                buildingChannelDTO.setExpirationDate(list.get(0).getExpirationDate());
+                buildingChannelDTO.setRemark(list.get(0).getRemark());
+            }
+
+            responseBean.addSuccess(buildingChannelDTO);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("buildingChannelDelete -=- {}",e.toString());

src/main/resources/application-prod.yml

@@ -4,9 +4,12 @@ spring:
   application:
     name: zhiyun
   datasource:
-    username: marketing
-    password: u@cSFJ5*kS9hGP7a
-    url: jdbc:mysql://localhost:3306/marketing-cloud?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    username: marketing-cloud
+    password: uVV0kEQLFGqx4#mV
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/marketing-cloud?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+#    username: marketing
+#    password: u@cSFJ5*kS9hGP7a
+#    url: jdbc:mysql://localhost:3306/marketing-cloud?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.cj.jdbc.Driver
     initial-size: 10 # 初始化连接数
     max-active: 20 # 最大连接数

src/main/resources/log/logback-spring.xml

@@ -2,7 +2,8 @@
 <configuration debug="false">
     <springProfile name="prod">
         <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
-        <property name="LOG_HOME" value="/home/xlk/marketing-cloud/service/logs" />
+<!--        <property name="LOG_HOME" value="/home/xlk/marketing-cloud/service/logs" />-->
+        <property name="LOG_HOME" value="/yunpan/dev/logs" />
         <!-- 控制台输出 -->
         <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">