Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

# Conflicts:
#	fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ScreenshotServiceImpl.java

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/TimeCalculation.java

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author 吴涛涛
- * @since 2020-01-16
+ * @since 2020-02-06
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -39,7 +39,7 @@ public class TimeCalculation extends Model<TimeCalculation> {
     private String userId;
 
     /**
-     * 行为代码 等价于screenshot表中的pic_type
+     * 行为代码 -1-其他 0-编程 1-上网 2-文档 3-设计 4-美工 5-运营 6-小说 7-娱乐 8-音乐
      */
     @TableField("action_type")
     private Integer actionType;
@@ -68,6 +68,12 @@ public class TimeCalculation extends Model<TimeCalculation> {
     @TableField("duration")
     private Integer duration;
 
+    /**
+     * 开始时的第一张截图
+     */
+    @TableField("pic_url")
+    private String picUrl;
+
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ScreenshotServiceImpl.java

@@ -10,7 +10,6 @@ import com.management.platform.entity.TimeCalculation;
 import com.management.platform.entity.TimeCalculationShow;
 import com.management.platform.entity.vo.ScreenshotVO;
 import com.management.platform.mapper.*;
-import com.management.platform.mapper.PicContentKeywordsMapper;
 import com.management.platform.service.ScreenshotService;
 import com.management.platform.util.*;
 import org.apache.log4j.Logger;
@@ -444,7 +443,7 @@ public class ScreenshotServiceImpl extends ServiceImpl<ScreenshotMapper, Screens
     }
 
     public static void main(String[] args) throws Exception {
-//        String b = isDevelop(new File("C:\\Users\\seya\\Desktop\\ljn2.jpg"));
+//        String b = isDevelop(new File("C:\\Users\\seya\\Desktop\\wtt.jpg"));
 //        System.out.println("结果："+b);
     }
 
@@ -515,7 +514,7 @@ public class ScreenshotServiceImpl extends ServiceImpl<ScreenshotMapper, Screens
     }
 
     //判断是否是开发
-    private  String isDevelop(File pic) {
+    private String isDevelop(File pic) {
         File folder = new File(developFolder);
 //        File folder = new File("C:\\picrecongnize\\develop\\");
         if (!folder.exists()) {

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("time_calculation_show");
+        strategy.setInclude("time_calculation");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/TimeCalculationMapper.xml

@@ -4,23 +4,24 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.management.platform.entity.TimeCalculation">
-        <id column="id" property="id"/>
-        <result column="user_id" property="userId"/>
-        <result column="action_type" property="actionType"/>
-        <result column="date" property="date"/>
-        <result column="start_time" property="startTime"/>
-        <result column="end_time" property="endTime"/>
-        <result column="duration" property="duration"/>
+        <id column="id" property="id" />
+        <result column="user_id" property="userId" />
+        <result column="action_type" property="actionType" />
+        <result column="date" property="date" />
+        <result column="start_time" property="startTime" />
+        <result column="end_time" property="endTime" />
+        <result column="duration" property="duration" />
+        <result column="pic_url" property="picUrl" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, user_id, action_type, date, start_time, end_time, duration
+        id, user_id, action_type, date, start_time, end_time, duration, pic_url
     </sql>
 
     <!--分页获取异常记录-->
     <select id="getDevianceList" resultType="java.util.Map">
-        SELECT a.start_time AS time, b.name, a.action_type AS type, a.date
+        SELECT a.start_time AS time, b.name, a.action_type AS type, a.date, a.pic_url AS picUrl
         FROM time_calculation AS a
         LEFT JOIN user AS b ON a.user_id = b.id
         WHERE 1=1