Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into feature-bieao

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/AttendanceController.java

@@ -6,7 +6,6 @@ import cn.com.ty.lift.common.utils.ValuePool;
 import cn.com.ty.lift.common.verify.Val;
 import cn.com.ty.lift.common.verify.Validate;
 import cn.com.ty.lift.common.verify.Validation;
-import cn.com.ty.lift.common.verify.VerifyUtils;
 import cn.com.ty.lift.enterprise.oa.dto.AttendanceRequest;
 import cn.com.ty.lift.enterprise.oa.dto.AttendanceResponse;
 import cn.com.ty.lift.enterprise.oa.entity.Attendance;
@@ -282,7 +281,6 @@ public class AttendanceController {
     }
 
     @PostMapping("export")
-    @Validation(fields = {"ids"})
     public void export(@Val @RequestBody AttendanceRequest request, HttpServletResponse response) {
         log.info("headerAlias: {}", headerAlias);
         List<AttendanceResponse> attendances = attendanceService.listByIdList(request);

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/dto/AttendanceRequest.java

@@ -11,10 +11,11 @@ import java.util.List;
 
 /**
  * <p>
- *     签到管理接口请求入参
+ * 签到管理接口请求入参
  * </p>
+ *
  * @author wcz
- * @since  2019/12/12
+ * @since 2019/12/12
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -22,12 +23,12 @@ public class AttendanceRequest extends PageRequest {
     /**
      * 主键id
      */
-    @Min(value = 1,message = "签到记录ID有误")
+    @Min(value = 1, message = "签到记录ID有误")
     private Long id;
     /**
      * 维保公司id
      */
-    @Min(value = 1,message = "维保公司ID有误")
+    @Min(value = 1, message = "维保公司ID有误")
     private Long mtCompanyId;
     /**
      * 用户名称
@@ -102,8 +103,8 @@ public class AttendanceRequest extends PageRequest {
      * 21 下午上班 22 下午下班
      * 31 加班上班 32 加班下班
      */
-    @Min(value = 11,message = "签到类型有误")
-    @Max(value = 32,message = "签到类型有误")
+    @Min(value = 11, message = "签到类型有误")
+    @Max(value = 32, message = "签到类型有误")
     private Integer type;
 
     @Min(value = 1, message = "当前用户ID有误")
@@ -112,6 +113,7 @@ public class AttendanceRequest extends PageRequest {
     /**
      * 导出记录的id列表
      */
-    @NotEmpty(message = "签到记录ID列表有误")
     private List<Long> ids;
+
+    private String attendanceYearMonth;
 }

lift-enterprise-service/src/main/resources/application-test.yml

@@ -1,16 +1,16 @@
 spring:
   datasource:
-    url: jdbc:mysql://111.47.6.224:13769/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.1.122:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     username: root
-    password: Tyty-2020
+    password: Ty-20526
     driver-class-name: com.mysql.cj.jdbc.Driver
 
   #redis缓存配置
   redis:
     database: 0 #数据库索引，默认为0
-    host: 111.47.6.224 #服务器地址
-    port: 13789 #端口
-    password: newtyty #验证密码
+    host: 192.168.1.122 #服务器地址
+    port: 6379 #端口
+    password: tytykj #验证密码
     jedis:
       pool:
         max-active: 8 #最大连接数

lift-enterprise-service/src/main/resources/mapper/oa/AttendanceMapper.xml

@@ -77,6 +77,16 @@
                     #{id}
                 </foreach>
             </if>
+            <if test="cond.userId != null and cond.userId != ''">
+                AND att.user_id = #{cond.userId}
+            </if>
+            <if test="cond.mtCompanyId != null and cond.mtCompanyId != ''">
+                AND att.mt_company_id = #{cond.mtCompanyId}
+            </if>
+            <if test="cond.attendanceYearMonth != null and cond.attendanceYearMonth != ''">
+                AND DATE_FORMAT(att.create_date,'%Y-%m') = #{cond.attendanceYearMonth}
+            </if>
+            ORDER BY att.create_date DESC
         </where>
     </select>
 

lift-push/src/main/java/cn/com/ty/lift/push/message/controller/TimeMessageController.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,6 +20,7 @@ import java.util.Collection;
 
 @RestController
 @AllArgsConstructor
+@Slf4j
 @RequestMapping("message")
 public class TimeMessageController {
     private final TimeMessageService timeMessageService;
@@ -69,6 +71,9 @@ public class TimeMessageController {
     @PostMapping("read")
     public RestResponse<Boolean> messages(@RequestBody MessageVo messageVo) {
         Collection<TimeMessage> timeMessages = timeMessageService.listByIds(messageVo.getIds());
+        if (timeMessages.isEmpty()) {
+            return RestResponse.success(true);
+        }
         timeMessages.forEach(timeMessage -> timeMessage.setViewFlag(1));
         return RestResponse.success(timeMessageService.updateBatchById(timeMessages));
     }

lift-push/src/main/resources/application-prod.yml

@@ -47,4 +47,8 @@ aliyun:
     endpoint: http://oss-cn-hangzhou.aliyuncs.com
     bucketName: ty-oss-file
     accessKeyId: LTAI4G1iLTczu8JxM2En57gY
-    accessKeySecret: VHeRj3C2br87Uh447ruHsSTvYSDWeC
+    accessKeySecret: VHeRj3C2br87Uh447ruHsSTvYSDWeC
+#xinge服务配置信息，加载到SystemConfiguration
+xinge:
+  appId: 40d4e2e854433
+  secretKey: fa99dc19157b00fc71cf8d7e840273a3

lift-push/src/main/resources/application-test.yml

@@ -1,16 +1,16 @@
 spring:
   datasource:
-    url: jdbc:mysql://111.47.6.224:13769/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.1.122:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     username: root
-    password: Tyty-2020
+    password: Ty200526
     driver-class-name: com.mysql.cj.jdbc.Driver
 
   #redis缓存配置
   redis:
     database: 0 #数据库索引，默认为0
-    host: 111.47.6.224 #服务器地址
-    port: 13789 #端口
-    password: newtyty #验证密码
+    host: 192.168.1.122 #服务器地址
+    port: 6379 #端口
+    password: tytykj    #验证密码
     jedis:
       pool:
         max-active: 8 #最大连接数

lift-upload/src/main/java/com/upload/util/WatermarkUtil.java

@@ -126,9 +126,9 @@ public class WatermarkUtil {
         //把待加水印的图片读入缓存
         BufferedImage bufImg = new BufferedImage(imgWidth, imgHeight, BufferedImage.TYPE_INT_RGB);
         //设置字体
-        int fontSize = imgWidth / 30;
+        int fontSize = imgWidth / 40;
         Font font = new Font("宋体", Font.BOLD, fontSize);
-        float registrationCodeX = imgWidth - imgWidth / 1920F * (registrationCode.length() * fontSize / 72F * 96F);
+        double registrationCodeX = imgWidth - (registrationCode.length() * fontSize * 0.56);
         //创建输出流
         ByteArrayOutputStream bs = new ByteArrayOutputStream();
         ImageOutputStream imageOutputStream = ImageIO.createImageOutputStream(bs);