修改时区问题

src/main/java/org/rcisoft/business/blesson/entity/BLessonPerson.java

 package org.rcisoft.business.blesson.entity;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -79,6 +80,7 @@ public class BLessonPerson extends IdEntity<BLessonPerson> {
     private Date finishDate;
 
     @ApiModelProperty(value = "签到日期")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy/MM/dd HH:mm:ss")
     private Date signDate;
     //-----------------------------
 

src/main/java/org/rcisoft/business/blesson/service/impl/BLessonPersonServiceImpl.java

@@ -388,7 +388,8 @@ public class BLessonPersonServiceImpl implements BLessonPersonService {
         }
         bLessonPerson.setSignDate(new Date());
         bLessonPerson.setTrainIsSign("2");
-        int line = bLessonPersonRepository.updateByPrimaryKeySelective(bLessonPerson);
+        UserUtil.setCurrentMergeOperation(bLessonPerson);
+        int line = bLessonPersonRepository.updateByPrimaryKey(bLessonPerson);
         return new PersistModel(line);
     }
 

src/main/java/org/rcisoft/common/util/feignClient/MicroappFeignClient.java

@@ -21,6 +21,8 @@ public interface MicroappFeignClient {
     @RequestMapping(value = "/micro_app/isHaveApps",method = RequestMethod.GET)
     Ret isHaveApps(@RequestParam("UserId") Long UserId,
                     @RequestParam("corpId") Long corpId,
-                    @RequestParam("appId") Long appId
-    );
+                    @RequestParam("appId") Long appId,
+                   @RequestParam("zxClientType") String zxClientType,
+                   @RequestParam("zxAccountId") Long zxAccountId);
+
 }

src/main/java/org/rcisoft/common/util/outClient/MTMicroappApiRequestClient.java

@@ -5,6 +5,7 @@ import org.rcisoft.common.util.feignClient.FileFeignClient;
 import org.rcisoft.common.util.feignClient.MicroappFeignClient;
 import org.rcisoft.common.util.feignDto.MTOssRspDTO;
 import org.rcisoft.core.result.Ret;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -16,13 +17,18 @@ import org.springframework.web.multipart.MultipartFile;
 @Component
 public class MTMicroappApiRequestClient {
 
+    public static String zxClientType = "app";
+
+    public static Long zxAccountId = (long)1;
+
+
     public static Long appId = (long)1;
 
-//    @Autowired
+    @Autowired
     private MicroappFeignClient microappFeignClient;
 
     public boolean isHaveApps(long userId, long corpId) {
-        Ret ret = microappFeignClient.isHaveApps(userId,corpId,appId);
+        Ret ret = microappFeignClient.isHaveApps(userId,corpId,appId,zxClientType,zxAccountId);
         if(ret != null && "M0000".equals(ret.getCode())){
             return (boolean) ret.getData();
         }

src/main/java/org/rcisoft/core/task/messageTask.java

@@ -40,7 +40,7 @@ public class messageTask {
     @Autowired
     BNoticeService bNoticeServiceImpl;
 
-//    @Scheduled(cron = "0 0/1 * * * ?")
+    @Scheduled(cron = "0 0/1 * * * ?")
     @Transactional(propagation = Propagation.REQUIRED, readOnly = false)
     public void work() throws Exception {
         Date nowDate = new Date();

src/main/resources/application-mt.yml

@@ -43,7 +43,7 @@ pagehelper:
 
 spring:
   datasource:
-    url: jdbc:mysql://mt_mysql:3306/edu_db?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true
+    url: jdbc:mysql://mt_mysql:3306/edu_db?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true&serverTimezone=GMT%2B8
     username: root
     password: 91isoft
     type: com.zaxxer.hikari.HikariDataSource

src/main/resources/application-test.yml

@@ -43,7 +43,7 @@ pagehelper:
 
 spring:
   datasource:
-    url: jdbc:mysql://192.168.5.41:3306/zx_education?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true
+    url: jdbc:mysql://192.168.5.41:3306/zx_education?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true&serverTimezone=GMT%2B8
     username: edu
     password: edu20191127
     type: com.zaxxer.hikari.HikariDataSource

src/main/resources/mapper/sys/user/mapper/UserMapper.xml

@@ -19,6 +19,7 @@
         <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
         <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
         <result column="lock_num" property="lockNum" jdbcType="INTEGER" />
+        <result column="corp_id" property="corpId" jdbcType="VARCHAR" />
 <!--        <result column="role_name" property="roleName" jdbcType="VARCHAR" />-->
         <collection property="roleList" ofType="org.rcisoft.sys.user.entity.SysUser"
                     javaType="java.util.ArrayList" select="org.rcisoft.sys.user.dao.SysUserMapper.queryRoleByUserId"