Merge branch 'master' of C:\Users\13110\IdeaProjects\qunzhi\work_service with conflicts.

wisenergy-common/wisenergy-common.iml

@@ -92,8 +92,6 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.10" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.10" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.8" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-devtools:2.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.5.RELEASE" level="project" />
@@ -179,5 +177,7 @@
     <orderEntry type="library" name="Maven: cglib:cglib:3.1" level="project" />
     <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" />
     <orderEntry type="library" name="Maven: org.ehcache:ehcache:3.6.3" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
   </component>
 </module>
\ No newline at end of file

wisenergy-mapper/src/main/resources/mapper/WorkCollectMapper.xml

@@ -14,7 +14,7 @@
     </resultMap>
 
     <sql id="vals">
-        #{userId},#{workDay},#{totalTime},#{status},now(),now()
+    #{userId},#{workDay},#{totalTime},#{status},now(),now()
     </sql>
 
     <!-- 通用查询结果列 -->

wisenergy-mapper/src/main/resources/mapper/WorkDeptMapper.xml

@@ -35,4 +35,11 @@
         id, oa_dept_id, dept_name, create_time, modify_time
     </sql>
 
+
+    <select id="getDeptById" resultMap="BaseResultMap" parameterType="integer">
+        select <include refid="cols_all"/>
+        from <include refid="table"/>
+        where id = #{deptId}
+    </select>
+
 </mapper>

wisenergy-mapper/wisenergy-mapper.iml

@@ -90,7 +90,6 @@
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.4" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.10" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.10" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.8" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.22" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" />
@@ -182,5 +181,6 @@
     <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.26" level="project" />
     <orderEntry type="library" name="Maven: org.ehcache:ehcache:3.6.3" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.2" level="project" />
   </component>
 </module>
\ No newline at end of file

wisenergy-model/src/main/java/cn/wisenergy/model/dto/ResultUser.java

+package cn.wisenergy.model.dto;
+
+/**
+ * @description: 用户信息返回结果
+ * @author: nh
+ * @create: 2021-01-21 23:13
+ **/
+public class ResultUser {
+}

wisenergy-model/wisenergy-model.iml

@@ -88,7 +88,6 @@
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.4" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.10" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.10" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.8" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.22" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" />
@@ -150,7 +149,6 @@
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.0" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.0" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.5" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.0" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.0" level="project" />
@@ -180,5 +178,7 @@
     <orderEntry type="library" name="Maven: cglib:cglib:3.1" level="project" />
     <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" />
     <orderEntry type="library" name="Maven: org.ehcache:ehcache:3.6.3" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
   </component>
 </module>
\ No newline at end of file

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkDeptServiceImpl.java

@@ -30,7 +30,8 @@ public class WorkDeptServiceImpl implements WorkDeptService {
     @Autowired
     private WorkDeptMapper workDeptMapper;
 
-      WorkUserService workUserService;
+    @Autowired
+    private WorkUserService workUserService;
     @Override
     public WorkDept getById(Integer id) {
         log.info("WorkDeptServiceImpl[]getById[]input.param.id" + id);

wisenergy-service/wisenergy-service.iml

@@ -88,7 +88,6 @@
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.4" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.10" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.10" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.8" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.22" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" />
@@ -183,5 +182,6 @@
     <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.26" level="project" />
     <orderEntry type="library" name="Maven: org.ehcache:ehcache:3.6.3" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.2" level="project" />
   </component>
 </module>
\ No newline at end of file

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/StatisticsController.java

@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
 import java.util.List;
 
 /**

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/WorkOrderController.java

-package cn.wisenergy.web.admin.controller.app;
-
-import cn.wisenergy.common.utils.exception.BASE_RESP_CODE_ENUM;
-import cn.wisenergy.common.utils.exception.BaseCustomException;
-import cn.wisenergy.common.utils.exception.Result;
-import cn.wisenergy.service.WorkTimeOrderService;
-import cn.wisenergy.web.admin.controller.common.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @description:
- * @author: nh
- * @create: 2021-01-19 16:05
- **/
-@RestController
-@RequestMapping(value = "/workOrder")
-@Slf4j
-@Api(tags = "工单模块")
-public class WorkOrderController extends BaseController {
-    @Autowired
-    WorkTimeOrderService workOrderService;
-
-    @ApiOperation(value = "获取本月工时统计", notes = "获取本月工时统计")
-    @ApiImplicitParam(name = "userId", value = "用户主键",dataType = "integer", required = true)
-    @GetMapping("getMonthlyWorkingHours")
-    public Result<ArrayList<Object>> getMonthlyWorkingHours(Integer userId){
-        log.info("WorkOrderController[]getMonthlyWorkingHours[]input.param" + userId);
-        if (userId == null) {
-            throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
-        }
-        List<Object> monthlyStatistics = workOrderService.getMonthlyStatistics(userId);
-        return getResult(monthlyStatistics);
-    }
-}

wisenergy-web-admin/src/main/resources/application-dev.yml

@@ -3,9 +3,9 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://192.168.110.84:3306/work_hours?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
+      url: jdbc:mysql://localhost:3306/working_hours?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
       username: root
-      password: admin!@#123
+      password: admin
       initial-size: 10
       max-active: 100
       min-idle: 10

wisenergy-web-admin/wisenergy-web-admin.iml

@@ -88,7 +88,6 @@
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.4" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.10" level="project" />
     <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.10" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.8" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.1.22" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" />
@@ -141,7 +140,6 @@
     <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.apache.velocity:velocity-engine-core:2.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.4" level="project" />
     <orderEntry type="library" name="Maven: com.hikvision.ga:artemis-http-client:1.1.3" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
@@ -185,5 +183,7 @@
     <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.26" level="project" />
     <orderEntry type="library" name="Maven: org.ehcache:ehcache:3.6.3" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.0" level="project" />
   </component>
 </module>
\ No newline at end of file