1

src/main/java/com/fdkankan/manage/controller/IndexController.java

@@ -5,6 +5,7 @@ import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.JyPlatform;
 import com.fdkankan.manage.entity.JyUser;
 import com.fdkankan.manage.service.IJyPlatformService;
+import com.fdkankan.manage.service.IJyPlatformUserWaitService;
 import com.fdkankan.manage.service.IJyUserService;
 import com.fdkankan.manage.vo.request.JyPlatformParam;
 import com.fdkankan.manage.vo.request.UserParam;
@@ -27,23 +28,12 @@ public class IndexController {
 
     @Autowired
     IJyPlatformService jyPlatformService;
-    @Autowired
-    IJyUserService jyUserService;
 
     @GetMapping("/addressKey/{address}")
     public ResultData getByAddress(@PathVariable String address){
         return ResultData.ok(jyPlatformService.getByAddress(address));
     }
 
-    @GetMapping("test")
-    public ResultData test(){
-        UserParam userParam = new UserParam();
-        userParam.setRyId("11");
-        userParam.setRyNo("122");
-        List<JyUser> jyUserList = jyUserService.getByAddParam(userParam);
-
-        return ResultData.ok(jyUserList);
-    }
 
 }
 

src/main/java/com/fdkankan/manage/entity/JyPlatform.java

@@ -1,10 +1,7 @@
 package com.fdkankan.manage.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.io.Serializable;
 import java.util.Date;
 import lombok.Getter;
@@ -43,18 +40,18 @@ public class JyPlatform implements Serializable {
     /**
      * 平台管理员姓名
      */
-    @TableField("name")
+    @TableField(value = "name",updateStrategy = FieldStrategy.IGNORED)
     private String name;
 
     /**
      * 平台管理手机号码
      */
-    @TableField("phone")
+    @TableField(value = "phone",updateStrategy = FieldStrategy.IGNORED)
     private String phone;
     /**
      * 平台管理身份证号码
      */
-    @TableField("id_card")
+    @TableField(value = "id_card",updateStrategy = FieldStrategy.IGNORED)
     private String idCard;
 
     @TableField("status")

src/main/java/com/fdkankan/manage/service/impl/UserServiceImpl.java

@@ -225,13 +225,21 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
             if(sysUser.getRoleId() != 47L){
                 sysUserService.updateRoleId(sysUser.getId(),47L);
             }
+            JyPlatform jyPlatform = jyPlatformService.getByIdCard(jyUser.getIdCard());
+            if(jyPlatform != null && jyPlatform.getStatus() == 0){
+                jyPlatform.setName(null);
+                jyPlatform.setPhone(null);
+                jyPlatform.setIdCard(null);
+                jyPlatform.setUpdateTime(null);
+                jyPlatformService.updateById(jyPlatform);
+            }
             jyUser.setPlatformId(1);
         }
 
-        if(param.getIsJm() != null && param.getIsJm() ==0 ){
+        if(param.getIsJm() != null  ){
             JyPlatformUserWait platformUserWait = platformUserWaitService.getByName(jyUser.getRyNickName());
             if(platformUserWait != null){
-                jyUser.setPlatformId(platformUserWait.getPlatformId());
+                jyUser.setPlatformId(param.getIsJm() == 0?platformUserWait.getPlatformId():1);
                 platformUserWaitService.del(platformUserWait.getId());
             }
         }

src/main/java/com/fdkankan/manage/util/Dateutils.java

@@ -1,5 +1,6 @@
 package com.fdkankan.manage.util;
 
+import cn.hutool.core.date.DateUtil;
 import org.apache.commons.lang3.StringUtils;
 
 import java.text.SimpleDateFormat;
@@ -128,7 +129,7 @@ public class Dateutils {
     }
     public static String formatEndTime(String endTime) {
         if(StringUtils.isBlank(endTime)){
-            endTime = Dateutils.getDate(new Date());
+            endTime = DateUtil.format(new Date(),"yyyy-MM-dd") + "23:59:59";
         }
         if(endTime.length() <12 ){  //月，开始时间到1号 0点
             endTime +=  " 23:59:59";

src/main/resources/bootstrap-dev.yml

@@ -4,30 +4,26 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 120.24.144.164:8848
+        server-addr: 192.168.0.25:8848
         file-extension: yaml
-        namespace: 4dkankan-test
+        namespace: dev
         extension-configs:
           - data-id: 4dkankan-center-manage.yaml
             group: DEFAULT_GROUP
             refresh: true
         shared-configs:
-
-          - data-id: common-redis-config-52.yaml
+          - data-id: common-redis-config.yaml
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: other-config.yaml
+          - data-id: common-config.yaml
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-upload-config.yaml
+          - data-id: common-fyun-config.yaml
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-mongodb-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
 
           - data-id: forest-config.yaml
             group: DEFAULT_GROUP
@@ -39,7 +35,3 @@ spring:
 
 
 
-
-
-
-

src/main/resources/bootstrap-prod.yml

@@ -1,40 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-manage
-  cloud:
-    nacos:
-      config:
-        server-addr: 172.20.1.63:8848
-        file-extension: yaml
-        namespace: 4dkankan-v4-prod
-        extension-configs:
-          - data-id: 4dkankan-center-manage.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-        shared-configs:
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-fyun-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-mongodb-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: forest-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-      discovery:
-        server-addr: ${spring.cloud.nacos.config.server-addr}
-        namespace: ${spring.cloud.nacos.config.namespace}
-
-
-

src/main/resources/bootstrap-test-eur.yml

@@ -1,40 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-manage
-  cloud:
-    nacos:
-      config:
-        server-addr: 120.24.144.164:8848
-        file-extension: yaml
-        namespace: 4dkankan-v4-test-eur
-        extension-configs:
-          - data-id: 4dkankan-center-manage.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-        shared-configs:
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-fyun-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-mongodb-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: forest-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-      discovery:
-        server-addr: ${spring.cloud.nacos.config.server-addr}
-        namespace: ${spring.cloud.nacos.config.namespace}
-
-
-

src/main/resources/bootstrap-test.yml

@@ -1,40 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-manage
-  cloud:
-    nacos:
-      config:
-        server-addr: 120.24.144.164:8848
-        file-extension: yaml
-        namespace: 4dkankan-v4-test
-        extension-configs:
-          - data-id: 4dkankan-center-manage.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-        shared-configs:
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-fyun-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-mongodb-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: forest-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-      discovery:
-        server-addr: ${spring.cloud.nacos.config.server-addr}
-        namespace: ${spring.cloud.nacos.config.namespace}
-
-
-

src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: test
+    active: dev
 logging:
   config: classpath:logback-spring.xml
 mybatis-plus: