Commit f3cff5c8 authored by nie'hong's avatar nie'hong

导出完成

parent 7520d971
package cn.wisenergy.common.utils.exception;
/**
* 响应码基类
*
* @author wyy
* @data 2019/08/15
*/
public enum BASE_RESP_CODE_ENUM {
/********************* SpringMBoot 系统异常 **********************/
MIS_REQ_PARAM("400", "请求参数丢失"),
NO_AUTH_REQUEST("401", "未授权"),
REJECT_REQUEST("403", "未授权"),
RESOURCE_NOT_FOUND("404", "请求的资源不存在"),
METHOD_NOT_SUPPORTED("405", "不支持的请求方法"),
MEDIA_TYPE_NOT_ACCEPT("406", "无法接受请求中的媒体类型"),
REQUEST_TIME_OUT("408", "无法接受请求中的媒体类型"),
MEDIA_TYPE_NOT_SUPPORTED("415", "不支持的媒体类型"),
SERVER_ERROR("500", "获取数据异常"),
INPUT_PARAM_IS_NULL("600", "入参为空"),
WORK_ORDER_INFO_IS_NULL("601", "工单信息为空"),
USER_ADD_FAIL("602", "新建用户失败"),
UPDATE_DATA_FAIL("603", "更新数据失败"),
USER_UPDATE_PASSWORD_FAIL("604", "用户修改密码失败"),
UPDATE_PASSWORD_FAIL_OLD_PASSWORD_ERROR("605", "修改密码失败,旧密码错误"),
RECORD_WORD_ADD_FAIL("606", "字段添加失败"),
USER_RESET_PASSWORD_FAIL("607", "用户重置密码失败"),
FILE_NOT_NULL("608", "上传文件不能为空"),
STATISTICS_RECORD_DATA_FAIL("609", "统计档案数据失败"),
EQUIPMENT_INFO_IS_NULL("610", "设备信息为空"),
QUERY_WORK_ORDER_DATA_IS_NULL("611", "获取工单数据为空"),
WORK_TIME_NOT_OVER_EIGHT("611", "每日累计工时不超过8小时"),
USER_ACCOUNT_ALREADY_EXIST("612", "用户账号已存在"),
USER_PHONE_ALREADY_EXIST("613", "该手机号已被注册"),
INSERT_DATA_IS_FAIL("614", "插入数据失败"),
FILE_INCORRETC_FORMAT("615", "文件格式不正确"),
RECORD_WORD_REPEAT("616", "字段名称重复"),
WORD_NAME_REPEAT("617", "字段名称请勿重复"),
QUERY_USER_INFO_FAIL("618", "获取用户信息失败"),
WORK_ORDER_ALREADY_COMMIT("619", "工单已填报,不能重复填报"),
WORK_TIME_OVER_NOW_DAY("620", "工单日期不能大于当天"),
INSERT_WORK_COLLECT_DATA_FAIL("621", "插入工时单汇总信息失败"),
NO_JOIN_EVERY_PROJECT_PLASE_JION("622", "您还没有加入项目中,请先去加入项目"),
THE_USER_NOT_MANAGER_PLASE_MANAGER_LOGIN("623", "您不是管理员,请登录管理员账号"),
DEPT_NOT_HAVE_USER("624", "该部门下没有人员"),
PROJECT_NOT_HAVE_USER("624", "该部门下没有项目"),
USER_PHONE_IS_ERROR("625", "用户名/手机号不正确"),
DELETE_OLD_WORK_ORDER_FAIL("626","删除旧工单数据失败"),
DEPT_NOT_FOUND("627", "部门信息未找到");
/**
* 错误编码
*/
public String code;
/**
* 错误编码信息
*/
public String msg;
/**
* 构造函数
*
* @param code 编码
* @param msg 编码信息
*/
BASE_RESP_CODE_ENUM(String code, String msg) {
this.code = code;
this.msg = msg;
}
/**
* 获取编码
*/
public String getCode() {
return code;
}
/**
* 设置编码
*/
public void setCode(String code) {
this.code = code;
}
/**
* 获取编码信息
*/
public String getMsg() {
return msg;
}
/**
* 设置编码信息
*/
public void setMsg(String msg) {
this.msg = msg;
}
}
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
</facet>
<facet type="web" name="Web">
<configuration>
<webroots />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" /> <output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" />
...@@ -35,6 +45,10 @@ ...@@ -35,6 +45,10 @@
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.0" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
<orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-undertow:2.1.5.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-undertow:2.1.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.undertow:undertow-core:2.0.20.Final" level="project" /> <orderEntry type="library" name="Maven: io.undertow:undertow-core:2.0.20.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.xnio:xnio-api:3.3.8.Final" level="project" /> <orderEntry type="library" name="Maven: org.jboss.xnio:xnio-api:3.3.8.Final" level="project" />
...@@ -68,8 +82,6 @@ ...@@ -68,8 +82,6 @@
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-test:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-test:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" /> <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
<orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.2" level="project" /> <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.5.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" /> <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
...@@ -137,8 +149,6 @@ ...@@ -137,8 +149,6 @@
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.4.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.4.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.4.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.4.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.4.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.4.0" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.4.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.4.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.4.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.4.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.4.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.4.0" level="project" />
......
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.WorkCollect;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
public interface WorkCollectMapper extends BaseMapper<WorkCollect> {
}
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.WorkDept;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
/**
* <p>
* Mapper 接口
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
public interface WorkDeptMapper extends BaseMapper<WorkDept> {
List<WorkDept> getDeptById(Integer deptId);
}
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.WorkHoliday;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
public interface WorkHolidayMapper extends BaseMapper<WorkHoliday> {
}
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.WorkProjectChange;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
public interface WorkProjectChangeMapper extends BaseMapper<WorkProjectChange> {
}
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.WorkProject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
import java.util.Map;
/**
* <p>
* Mapper 接口
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
public interface WorkProjectMapper extends BaseMapper<WorkProject> {
/**
* 条件查询项目集合
* @param map
* @return
*/
List<WorkProject> getProjectsByCriteria(Map<String, Object> map);
}
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.WorkSubmitAdopt;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
public interface WorkSbumitAdoptMapper extends BaseMapper<WorkSubmitAdopt> {
}
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.WorkTimeOrder;
import cn.wisenergy.model.dto.DayWorkTimeAndType;
import cn.wisenergy.model.dto.MonthlyWorkingHoursStatistics;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.HashMap;
import java.util.List;
/**
* <p>
* Mapper 接口
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
public interface WorkTimeOrderMapper extends BaseMapper<WorkTimeOrder> {
/**
* 根据填报项目类型获取次数和工时汇总
* @param userId
* @return
*/
MonthlyWorkingHoursStatistics collectByProjectType(Integer userId,Integer projectType, String currentMonthFirstDay);
/**
*
* @param year
* @param month
* @param userId
* @return
*/
List<DayWorkTimeAndType> listByDateAndUserId(Integer year, Integer month, Integer userId);
/**
* 根据条件获取大于某时间的工单数量
* @param map
* @return
*/
Integer getCountByCondition(HashMap<String, Object> map);
}
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.WorkUserDept;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
/**
* <p>
* Mapper 接口
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
public interface WorkUserDeptMapper extends BaseMapper<WorkUserDept> {
List<Integer> listByDeptId(Integer deptId);
}
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.WorkUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.HashMap;
/**
* <p>
* Mapper 接口
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
public interface WorkUserMapper extends BaseMapper<WorkUser> {
WorkUser getUserInfo(HashMap<String, Object> map);
WorkUser getUserById(Integer userId);
}
package cn.wisenergy.mapper;
import cn.wisenergy.model.app.WorkUserProject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
public interface WorkUserProjectMapper extends BaseMapper<WorkUserProject> {
}
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.wisenergy.mapper.WorkCollectMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.wisenergy.model.app.WorkCollect">
<id column="id" property="id" />
<result column="user_id" property="userId" />
<result column="work_day" property="workDay" />
<result column="total_time" property="totalTime" />
<result column="status" property="status" />
<result column="create_time" property="createTime" />
<result column="modify_time" property="modifyTime" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, user_id, work_day, total_time, status, create_time, modify_time
</sql>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.wisenergy.mapper.WorkDeptMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.wisenergy.model.app.WorkDept">
<id column="id" property="id" />
<result column="dept_name" property="deptName" />
<result column="oa_dept_id" property="oaDeptId"/>
<result column="create_time" property="createTime" />
<result column="modify_time" property="modifyTime" />
</resultMap>
<sql id="table">
work_dept
</sql>
<sql id="cols_all">
id, <include refid="cols_exclude_id"/>
</sql>
<sql id="cols_exclude_id">
dept_name, create_time, modify_time
</sql>
<sql id="criteria">
<if test="deptName != null">AND dept_name = #{deptName}</if>
<if test="createTime != null">AND create_time = #{createTime}</if>
<if test="modifyTime != null">AND modify_time = #{modifyTime}</if>
</sql>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
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>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.wisenergy.mapper.WorkHolidayMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.wisenergy.model.app.WorkHoliday">
<id column="id" property="id" />
<result column="day_start" property="dayStart" />
<result column="day_end" property="dayEnd" />
<result column="day_type" property="dayType" />
<result column="des" property="des" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, day_start, day_end, day_type, des
</sql>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.wisenergy.mapper.WorkProjectChangeMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.wisenergy.model.app.WorkProjectChange">
<id column="id" property="id" />
<result column="project_id" property="projectId" />
<result column="type" property="type" />
<result column="modify_after" property="modifyAfter" />
<result column="modify_before" property="modifyBefore" />
<result column="reason" property="reason" />
<result column="change_date" property="changeDate" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, project_id, type, content, reason, change_date
</sql>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.wisenergy.mapper.WorkProjectMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.wisenergy.model.app.WorkProject">
<id column="id" property="id" />
<result column="oa_project_number" property="oaProjectNumber" />
<result column="project_name" property="projectName" />
<result column="type" property="type" />
<result column="manager_id" property="managerId" />
<result column="manager_name" property="managerName" />
<result column="dept_id" property="deptId" />
<result column="work_time" property="workTime" />
<result column="cost_budget" property="costBudget" />
<result column="is_conclusion" property="isConclusion" />
<result column="start_time" property="startTime" />
<result column="end_time" property="endTime" />
<result column="create_time" property="createTime" />
<result column="modify_time" property="modifyTime" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, oa_project_number, project_name, type, manager_id, manager_name, dept_id, work_time, cost_budget, is_conclusion,start_time,end_time, create_time, modify_time
</sql>
<sql id="table">
work_project
</sql>
<!--查询条件-->
<sql id="criteria">
<if test="id != null">and id = #{id}</if>
<if test="oaProjectNumber != null">and oa_project_number = #{oaProjectNumber}</if>
<if test="projectName != null">and project_name = #{projectName}</if>
<if test="type != null">and type =#{type}</if>
<if test="managerId != null">and manager_id = #{managerId}</if>
<if test="managerName != null">and manager_name = #{managerName}</if>
<if test="dept_id != null">and dept_id = #{dept_id}</if>
<if test="workTime != null">and work_time =#{workTime}</if>
<if test="costBudget != null">and cost_budget = #{costBudget}</if>
<if test="isConclusion != null">and is_onclusion =#{isConclusion},</if>
<if test="startTime != null">and start_time =#{startTime},</if>
<if test="endTime != null">and end_time =#{endTime},</if>
<if test="createTime != null">and create_time &gt;= #{createTime}</if>
<if test="modifyTime != null">and #{modifyTime} &gt;= modify_time</if>
</sql>
<select id="getProjectsByCriteria" resultMap="BaseResultMap" parameterType="map">
select <include refid="Base_Column_List"/>
from <include refid="table"/>
<where>
<include refid="criteria"/>
</where>
</select>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.wisenergy.mapper.WorkSbumitAdoptMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.wisenergy.model.app.WorkSubmitAdopt">
<id column="id" property="id" />
<result column="submit_time" property="submitTime" />
<result column="auto_adopt" property="autoAdopt" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, submit_time, auto_adopt
</sql>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.wisenergy.mapper.WorkTimeOrderMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.wisenergy.model.app.WorkTimeOrder">
<id column="work_id" property="workId" />
<result column="user_id" property="userId" />
<result column="user_name" property="userName" />
<result column="project_id" property="projectId" />
<result column="project_name" property="projectName" />
<result column="dept_id" property="deptId" />
<result column="work_time" property="workTime" />
<result column="work_day" property="workDay" />
<result column="status" property="status" />
<result column="reviewer_id" property="reviewerId" />
<result column="des" property="des" />
<result column="reason" property="reason" />
<result column="type" property="type" />
<result column="is_overtime" property="isOvertime" />
<result column="create_time" property="createTime" />
<result column="modify_time" property="modifyTime" />
</resultMap>
<resultMap id="dayWorkTimeAndType" type="cn.wisenergy.model.dto.DayWorkTimeAndType">
<result property="day" column="day(work_day)"/>
<result property="type" column="type"/>
<result property="workTime" column="sum(work_time)"/>
</resultMap>
<resultMap id="monthlyWorkHourStatistics" type="cn.wisenergy.model.dto.MonthlyWorkingHoursStatistics">
<result property="projectType" column="type"/>
<result property="count" column="count(1)"/>
<result property="workTime" column="sum(work_time)"/>
</resultMap>
<sql id="table">
work_time_order
</sql>
<sql id="criteria">
<if test="workId != null">and work_id = #{workId}</if>
<if test="userId != null">and user_id = #{userId}</if>
<if test="userName != null">and user_name = #{userName}</if>
<if test="projectId != null">and project_id =#{projectId}</if>
<if test="projectName != null">and project_name = #{projectName}</if>
<if test="deptId != null">and dept_id = #{deptId}</if>
<if test="workTime != null">and work_time = #{workTime}</if>
<if test="workDay != null">and work_day = #{workDay}</if>
<if test=" status != null">and `status` = #{status}</if>
<if test=" reviewerId != null">and reviewer_id = #{reviewerId}</if>
<if test="des != null">and des =#{des}</if>
<if test="reason != null">and reason = #{reason}</if>
<if test="type != null">and type = #{type}</if>
<if test="isOvertime != null">and is_overtime = #{isOvertime}</if>
<if test="createTime != null">and create_time &gt;= #{createTime}</if>
<if test="modifyTime != null">and #{modifyTime} &gt;= modify_time</if>
</sql>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
work_id, user_id, user_name, project_id, project_name, dept_id, work_time, work_day, status, reviewer_id, des, reason, type, is_overtime, create_time, modify_time
</sql>
<select id="collectByProjectType" resultMap="monthlyWorkHourStatistics">
select type,count(1),sum(work_time)
from <include refid="table"/>
where user_id = #{userId} AND type = #{projectType} AND work_day >=#{currentMonthFirstDay}
</select>
<select id="listByDateAndUserId" resultMap="dayWorkTimeAndType">
select user_id,day(work_day),CASE when `type` = 3 then 1 when `type` = 4 then 2 else 0 end AS `type`, sum(work_time)
from <include refid="table"/>
where year(work_day) = #{year} AND month(work_day) = #{month} AND user_id = #{userId} AND status in (2,5)
group by user_id,day(work_day), CASE when `type` = 3 then 1 when `type` = 4 then 2 else 0 end
order by day(work_day)
</select>
<select id="getCountByCondition" resultType="integer" parameterType="map">
select count(1)
from <include refid="table"/>
<where>
<include refid="criteria"/>
<if test="startDay != null">
AND work_day>=#{startDay}
</if>
<if test="projectIds != null">
AND project_id IN
<foreach collection="projectIds" item="projectId" open="(" close=")" separator=",">
#{projectId}
</foreach>
</if>
<if test="statusArray != null">
AND `status` IN
<foreach collection="statusArray" item="workStatus" open="(" close=")" separator=",">#{workStatus}</foreach>
</if>
<if test="typeArray != null">
AND `type` IN
<foreach collection="typeArray" item="type" open="(" close=")" separator=",">
#{type}
</foreach>
</if>
</where>
</select>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.wisenergy.mapper.WorkUserDeptMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.wisenergy.model.app.WorkUserDept">
<id column="id" property="id" />
<result column="user_id" property="userId" />
<result column="dept_id" property="deptId" />
</resultMap>
<sql id="table">
work_user_dept
</sql>
<sql id="cols_all">
id, <include refid="cols_exclude_id"/>
</sql>
<sql id="cols_exclude_id">
user_id, dept_id
</sql>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, user_id, dept_id
</sql>
<select id="listByDeptId" resultType="integer" parameterType="integer">
select user_id
from <include refid="table"/>
where dept_id = #{deptId}
</select>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.wisenergy.mapper.WorkUserMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.wisenergy.model.app.WorkUser">
<id column="id" property="id" />
<result column="oa_user_id" property="oaUserId" />
<result column="dept_id" property="deptId" />
<result column="name" property="name" />
<result column="login_name" property="loginName" />
<result column="password" property="password" />
<result column="phone" property="phone" />
<result column="email" property="email" />
<result column="role" property="role" />
<result column="type" property="type" />
<result column="status" property="status" />
<result column="wx_id" property="wxId" />
<result column="level" property="level" />
<result column="create_time" property="createTime" />
<result column="modify_time" property="modifyTime" />
</resultMap>
<sql id="table">
work_user
</sql>
<sql id="cols_all">
id,
<include refid="cols_exclude_id"/>
</sql>
<sql id="cols_exclude_id">
name, oa_user_id, login_name, phone, dept_id, email, role ,type,status,wx_id,level,create_time,modify_time
</sql>
<sql id="values">
#{name},#{oaUserId},#{loginName},#{phone},#{deptId},#{email},#{role},#{type},#{status},#{wxId},#{level},now(),now()
</sql>
<sql id="updateCondition">
<if test="name != null">name = #{name},</if>
<if test="oaUserId != null">oa_user_id = #{oaUserId},</if>
<if test="loginName != null">login_name = #{loginName},</if>
<if test="phone != null">phone =#{phone},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
<if test="email != null">email = #{email},</if>
<if test="role != null">role = #{role},</if>
<if test="type != null">type =#{type},</if>
<if test="status != null">status = #{status},</if>
<if test="wxId != null">wx_id =#{wxId},</if>
<if test="level != null">level = #{level},</if>
modify_time =now()
</sql>
<sql id="criteria">
<if test="id != null">and id = #{id}</if>
<if test="oaUserId != null">and oa_user_id = #{oaUserId}</if>
<if test="name != null">and name = #{name}</if>
<if test="loginName != null">and login_name = #{loginName}</if>
<if test="phone != null">and phone =#{phone}</if>
<if test="deptId != null">and dept_id = #{deptId}</if>
<if test="email != null">and email = #{email}</if>
<if test="role != null">and role = #{role}</if>
<if test="type != null">and type =#{type}</if>
<if test="status != null">and status = #{status}</if>
<if test="wxId != null">and wx_id =#{wxId},</if>
<if test="level != null">and level = #{level}</if>
<if test="createTime != null">and create_time &gt;= #{createTime}</if>
<if test="modifyTime != null">and #{modifyTime} &gt;= modify_time</if>
</sql>
<select id="getUserInfo" resultMap="BaseResultMap" parameterType="map" >
select <include refid="cols_all"/>
from <include refid="table"/>
<where>
<include refid="criteria"/>
</where>
</select>
<select id="getUserById" resultMap="BaseResultMap" parameterType="map" >
select <include refid="cols_all"/>
from <include refid="table"/>
where id = #{userId}
</select>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.wisenergy.mapper.WorkUserProjectMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="cn.wisenergy.model.app.WorkUserProject">
<id column="id" property="id" />
<result column="user_id" property="userId" />
<result column="project_id" property="projectId" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, user_id, project_id
</sql>
</mapper>
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "http://mybatis.org/dtd/mybatis-3-config.dtd">
<configuration>
<settings>
<setting name="callSettersOnNulls" value="true"/>
<!--<setting name="proxyFactory" value="CGLIB"/>-->
<!-- <setting name="lazyLoadingEnabled" value="true"/>-->
<!-- 打印查询语句 -->
<setting name="logImpl" value="STDOUT_LOGGING" />
</settings>
<typeHandlers>
<typeHandler handler="cn.wisenergy.common.utils.mybatis.DecimalHandler" jdbcType="DECIMAL" javaType="java.math.BigDecimal"/>
</typeHandlers>
</configuration>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
</facet>
<facet type="web" name="Web">
<configuration>
<webroots />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" /> <output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" /> <excludeFolder url="file://$MODULE_DIR$/target" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
...@@ -14,7 +24,6 @@ ...@@ -14,7 +24,6 @@
<orderEntry type="module" module-name="wisenergy-common" /> <orderEntry type="module" module-name="wisenergy-common" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.5.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.5.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter: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-starter-logging:2.1.5.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.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-core:1.2.3" level="project" />
...@@ -39,6 +48,10 @@ ...@@ -39,6 +48,10 @@
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.0" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
<orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-undertow:2.1.5.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-undertow:2.1.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.undertow:undertow-core:2.0.20.Final" level="project" /> <orderEntry type="library" name="Maven: io.undertow:undertow-core:2.0.20.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.xnio:xnio-api:3.3.8.Final" level="project" /> <orderEntry type="library" name="Maven: org.jboss.xnio:xnio-api:3.3.8.Final" level="project" />
...@@ -72,26 +85,13 @@ ...@@ -72,26 +85,13 @@
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-test:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-test:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" /> <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
<orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.2" level="project" /> <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.5.RELEASE" level="project" />
<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.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.2" level="project" /> <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.2" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.4" level="project" /> <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.4" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.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-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-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.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: mysql:mysql-connector-java:8.0.16" level="project" /> <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.1.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.1.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.1.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.1.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.1.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.5.RELEASE" 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-spring-boot-starter:1.1.22" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" /> <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.5.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.5.RELEASE" level="project" />
...@@ -137,12 +137,24 @@ ...@@ -137,12 +137,24 @@
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.4.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.4.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.4.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.4.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.4.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.4.0" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.4.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.4.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.4.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.4.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.4.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.4.0" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.6.7" level="project" /> <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.6.7" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generator:3.4.1" level="project" />
<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: 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" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure: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-starter-jdbc:2.1.5.RELEASE" level="project" />
<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: org.apache.commons:commons-lang3:3.8.1" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" /> <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" name="Maven: commons-pool:commons-pool:1.6" level="project" /> <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.6" level="project" />
......
package cn.wisenergy.model.app;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="WorkCollect", description="工时汇总实体类")
public class WorkCollect implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(name = "id",value = "主键id")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty(name = "userId",value = "填报工时人员")
private Integer userId;
@ApiModelProperty(name = "workDay",value = "工时的日期")
private Date workDay;
@ApiModelProperty(name = "totalTime",value = "总工时")
private Integer totalTime;
@ApiModelProperty(name = "status",value = "状态: 1:已填报 ,2:已审核,3:被驳回")
private Integer status;
@ApiModelProperty(name = "createTime",value = "创建时间")
private Date createTime;
@ApiModelProperty(name = "modifyTime",value = "修改时间")
private Date modifyTime;
}
package cn.wisenergy.model.app;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="WorkDept", description="工单部门实体类")
public class WorkDept implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(name = "id",value = "主键id")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty(name = "deptName",value = "部门名称( '大数据产品及应用部''软件集成部''解决方案中心本部''遵义业务部'畅发科技''智慧城市部' '智慧勘察研发部' '汽车业务部')")
private String deptName;
@ApiModelProperty(name = "oaDeptId", value = "oa中的部门编号")
private String oaDeptId;
@ApiModelProperty(name = "createTime",value = "创建时间")
private Date createTime;
@ApiModelProperty(name = "modifyTime",value = "修改时间")
private Date modifyTime;
}
package cn.wisenergy.model.app;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="WorkHoliday", description="节假日实体类")
public class WorkHoliday implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(name = "id",value = "主键id")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty(name = "dayStart",value = "开始日期")
private Date dayStart;
@ApiModelProperty(name = "dayEnd",value = "结束日期")
private Date dayEnd;
@ApiModelProperty(name = "dayType",value = "日期类型:0工作日 1节日")
private Integer dayType;
@ApiModelProperty(name = "des",value = "日期说明")
private String des;
}
package cn.wisenergy.model.app;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="WorkProject", description="工单项目实体类")
public class WorkProject implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(name = "id",value = "主键id")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty(name = "projectNumber",value = "项目编号")
private String oaProjectNumber;
@ApiModelProperty(name = "projectName",value = "项目名称")
private String projectName;
@ApiModelProperty(name = "type",value = "1:项目,2:商机")
private Integer type;
@ApiModelProperty(name = "managerId",value = "项目经理userId")
private Integer managerId;
@ApiModelProperty(name = "managerName",value = "项目经理姓名")
private String managerName;
@ApiModelProperty(name = "deptId",value = "部门id")
private Integer deptId;
@ApiModelProperty(name = "workTime",value = "工时预算")
private Integer workTime;
@ApiModelProperty(name = "costBudget",value = "成本预算,以万为单位")
private BigDecimal costBudget;
@ApiModelProperty(name = "isConclusion",value = "是否结项 :0:项目已结束、1:项目未结束")
private Integer isConclusion;
@ApiModelProperty(name = "startTime",value = "项目开始时间")
private Integer startTime;
@ApiModelProperty(name = "endTime",value = "项目结束时间")
private Integer endTime;
@ApiModelProperty(name = "createTime",value = "创建时间")
private Date createTime;
@ApiModelProperty(name = "modifyTime",value = "修改时间")
private Date modifyTime;
}
package cn.wisenergy.model.app;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="WorkProjectChange", description="项目更改类")
public class WorkProjectChange implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(name = "id",value = "主键id")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty(name = "projectId;",value = "项目主键")
private Integer projectId;
@ApiModelProperty(name = "type",value = "1:成本预算变更,2:工时预算变更")
private Integer type;
@ApiModelProperty(name = "modifyAfter",value = "修改后的预算")
private String modifyAfter;
@ApiModelProperty(name = "modifyBefore",value = "修改前的预算")
private String modifyBefore;
@ApiModelProperty(name = "reason",value = "变更原因")
private String reason;
@ApiModelProperty(name = "changeDate",value = "变更日期")
private Date changeDate;
}
package cn.wisenergy.model.app;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
* <p>
*
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="WorkSubmitAdopt", description="自动提交审核类")
public class WorkSubmitAdopt implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(name = "id",value = "主键id")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty(name = "submitTime",value = "工时提交时限")
private Integer submitTime;
@ApiModelProperty(name = "autoAdopt",value = "工时自动审批时限")
private Integer autoAdopt;
}
package cn.wisenergy.model.app;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="WorkTimeOrder", description="工时单实体类")
public class WorkTimeOrder implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(name = "workId",value = "主键id")
@TableId(value = "work_id", type = IdType.AUTO)
private Integer workId;
@ApiModelProperty(name = "userId",value = "用户id")
private Integer userId;
@ApiModelProperty(name = "userName",value = "用户名")
private String userName;
@ApiModelProperty(name = "projectId",value = "项目主键")
private Integer projectId;
@ApiModelProperty(name = "projectName",value = "项目名称")
private String projectName;
@ApiModelProperty(name = "deptId",value = "用户部门主键")
private Integer deptId;
@ApiModelProperty(name = "workTime",value = "工时(整数)")
private Integer workTime;
@ApiModelProperty(name = "workDay",value = "工单日期")
private Date workDay;
@ApiModelProperty(name = "status",value = "工单审核状态 1:已填报,2:已审批,3:被驳回 4:重新提交 5:自动审核")
private Integer status;
@ApiModelProperty(name = "reviewerId",value = "审核人userId")
private Integer reviewerId;
@ApiModelProperty(name = "des",value = "工作简述")
private String des;
@ApiModelProperty(name = "reason",value = "审核理由")
private String reason;
@ApiModelProperty(name = "type",value = "1:项目,2:商机,3:请假,4:调休,5:外部商务、技术交流 6:内部培训、技术准备、管理 7:其他非项目/商机工作")
private Integer type;
@ApiModelProperty(name = "isOvertime",value = "0:正常工时,1:加班")
private Integer isOvertime;
@ApiModelProperty(name = "createTime",value = "工单创建时间")
private Date createTime;
@ApiModelProperty(name = "modifyTime",value = "工单修改时间")
private Date modifyTime;
}
package cn.wisenergy.model.app;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="WorkUser", description="用户实体类")
public class WorkUser implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(name = "id",value = "主键")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty(name = "oaUserId",value = "oa中的用户编号")
private String oaUserId;
@ApiModelProperty(name = "deptId",value = "部门id")
private Integer deptId;
@ApiModelProperty(name = "name",value = "用户名")
private String name;
@ApiModelProperty(name = "loginName",value = "登录名")
private String loginName;
@ApiModelProperty(name = "password",value = "密码")
private String password;
@ApiModelProperty(name = "phone",value = "手机号")
private String phone;
@ApiModelProperty(name = "email",value = "邮箱")
private String email;
@ApiModelProperty(name = "role",value = "角色(产品、开发、测试、售前)")
private String role;
@ApiModelProperty(name = "type",value = "类型(公司、外协)")
private String type;
@ApiModelProperty(name = "status",value = "状态(1:在职、0:离职)")
private Integer status;
@ApiModelProperty(name = "wxId",value = "微信id")
private String wxId;
@ApiModelProperty(name = "level",value = "权限级别:普通用户:0,项目/商机级别:1,部门级别:2,中心级别:3,系统管理员:4")
private Integer level;
@ApiModelProperty(name = "createTime",value = "创建时间")
private Date createTime;
@ApiModelProperty(name = "modifyTime",value = "更新时间")
private Date modifyTime;
}
package cn.wisenergy.model.app;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
* <p>
*
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="WorkUserDept", description="工单用户部门关联实体类")
public class WorkUserDept implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(name = "id",value = "主键id")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty(name = "userId",value = "用户id")
private Integer userId;
@ApiModelProperty(name = "deptId",value = "部门id")
private Integer deptId;
}
package cn.wisenergy.model.app;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
* <p>
*
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="WorkUserProject", description="工单用户项目关联实体类")
public class WorkUserProject implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(name = "id",value = "主键id")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty(name = "userId",value = "用户id")
private Integer userId;
@ApiModelProperty(name = "projectId",value = "项目id")
private Integer projectId;
}
package cn.wisenergy.model.dto;
import lombok.Data;
import java.io.Serializable;
/**
* @description: 月审批
* @author: nh
* @create: 2021-01-19 16:00
**/
@Data
public class ApprovalStatistics implements Serializable {
private static final long serialVersionUID = -8541322571924444314L;
/**
* 已审批条数
*/
private Integer approvalCount;
/**
* 未审批条数
*/
private Integer notApprovalCount;
/**
* 驳回未重报
*/
private Integer rejectNotSubmit;
}
package cn.wisenergy.model.enums;
/**
* @program: springboot
* @description:
* @author: 聂某
* @create: 2020-12-23 16:58
**/
public enum ManagerEnum {
NOT_MANAGER(0, "该用户不是管理员"),
IS_PROJECT_DIRECTOR(1,"用户是项目/商机负责人"),
IS_DEPARTMENT_DIRECTOR(2,"用户是部门负责人"),
IS_CENTRE_DIRECTOR(3,"用户是中心负责人"),
IS_SYSTEM_MANAGER(4,"用户是系统负责人");
private Integer code;
private String msg;
ManagerEnum(Integer code, String msg){
this.code = code;
this.msg = msg;
}
public Integer getCode(){
return code;
}
public String getMsg(){
return msg;
}
}
package cn.wisenergy.model.enums;
public enum ProjectTypeEnum {
PROJECT(0, "该项目类型是项目"),
BUSINESS_OPPORTUNITY(1,"该项目类型是商机");
private Integer code;
private String msg;
ProjectTypeEnum(Integer code, String msg){
this.code = code;
this.msg = msg;
}
public Integer getCode(){
return code;
}
public String getMsg(){
return msg;
}
}
package cn.wisenergy.model.enums;
public enum WorkOrderStatus {
WAIT_AUDIT(1, "待审核"),
ALREADY_AUDIT(2, "已审核"),
TURN_DOWN(3, "驳回"),
RE_SUBMIT(4, "重新提交"),
AUTO_AUDIT(5, "自动审核");
private Integer code;
private String desc;
WorkOrderStatus(Integer code, String desc) {
this.code = code;
this.desc = desc;
}
public Integer getCode() {
return code;
}
public void setCode(Integer code) {
this.code = code;
}
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
}
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
</facet>
<facet type="web" name="Web">
<configuration>
<webroots />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" /> <output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" />
...@@ -12,7 +22,6 @@ ...@@ -12,7 +22,6 @@
<orderEntry type="module" module-name="wisenergy-common" /> <orderEntry type="module" module-name="wisenergy-common" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.5.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.5.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter: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-starter-logging:2.1.5.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.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-core:1.2.3" level="project" />
...@@ -37,6 +46,10 @@ ...@@ -37,6 +46,10 @@
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.0" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
<orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-undertow:2.1.5.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-undertow:2.1.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.undertow:undertow-core:2.0.20.Final" level="project" /> <orderEntry type="library" name="Maven: io.undertow:undertow-core:2.0.20.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.xnio:xnio-api:3.3.8.Final" level="project" /> <orderEntry type="library" name="Maven: org.jboss.xnio:xnio-api:3.3.8.Final" level="project" />
...@@ -70,26 +83,13 @@ ...@@ -70,26 +83,13 @@
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-test:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-test:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" /> <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
<orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.2" level="project" /> <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.5.RELEASE" level="project" />
<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.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.2" level="project" /> <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.2" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.4" level="project" /> <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.4" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.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-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-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.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: mysql:mysql-connector-java:8.0.16" level="project" /> <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.1.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.1.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.1.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.1.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.1.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.5.RELEASE" 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-spring-boot-starter:1.1.22" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" /> <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.5.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.5.RELEASE" level="project" />
...@@ -135,8 +135,6 @@ ...@@ -135,8 +135,6 @@
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.4.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.4.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.4.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.4.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.4.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.4.0" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.4.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.4.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.4.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.4.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.4.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.4.0" level="project" />
...@@ -148,6 +146,21 @@ ...@@ -148,6 +146,21 @@
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" level="project" />
<orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" /> <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.6.7" level="project" /> <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.6.7" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generator:3.4.1" level="project" />
<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" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure: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-starter-jdbc:2.1.5.RELEASE" level="project" />
<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: org.slf4j:slf4j-api:1.7.26" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" /> <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" name="Maven: commons-pool:commons-pool:1.6" level="project" /> <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.6" level="project" />
...@@ -166,7 +179,6 @@ ...@@ -166,7 +179,6 @@
<orderEntry type="library" name="Maven: com.alibaba:easyexcel:2.2.6" level="project" /> <orderEntry type="library" name="Maven: com.alibaba:easyexcel:2.2.6" level="project" />
<orderEntry type="library" name="Maven: cglib:cglib:3.1" level="project" /> <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.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: org.ehcache:ehcache:3.6.3" level="project" />
</component> </component>
</module> </module>
\ No newline at end of file
package cn.wisenergy.service;
/**
* <p>
* 服务类
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
public interface WorkCollectService {
}
package cn.wisenergy.service;
import cn.wisenergy.model.app.WorkDept;
import java.util.List;
/**
* <p>
* 服务类
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
public interface WorkDeptService {
/**
* 获取所有部门的信息
* @param userId
* @return
*/
List<WorkDept> getDeptInfo(Integer userId, Integer deptId);
}
package cn.wisenergy.service;
/**
* <p>
* 服务类
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
public interface WorkHolidayService {
}
package cn.wisenergy.service;
import cn.wisenergy.model.app.WorkProjectChange;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 服务类
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
public interface WorkProjectChangeService {
}
package cn.wisenergy.service;
import cn.wisenergy.model.app.WorkProject;
import java.util.List;
/**
* <p>
* 服务类
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
public interface WorkProjectService {
/**
* 获取用户管理项目
* @param userId
* @return
*/
List<WorkProject> getUserManageProjects(Integer userId);
}
package cn.wisenergy.service;
/**
* <p>
* 服务类
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
public interface WorkSbumitAdoptService {
}
package cn.wisenergy.service;
import java.util.ArrayList;
/**
* <p>
* 服务类
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
public interface WorkTimeOrderService{
/**
* 获取用户本月填报和审批情况,权限为填报时只有填报情况
* @param userId
* @return
*/
ArrayList<Object> getMonthlyStatistics(Integer userId);
}
package cn.wisenergy.service;
/**
* <p>
* 服务类
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
public interface WorkUserDeptService {
}
package cn.wisenergy.service;
import cn.wisenergy.model.app.WorkProject;
import java.util.List;
/**
* <p>
* 服务类
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
public interface WorkUserProjectService {
List<WorkProject> getUserManageProject(Integer userId);
}
package cn.wisenergy.service;
import cn.wisenergy.model.app.WorkUser;
/**
* <p>
* 服务类
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
public interface WorkUserService {
/**
* 用户登录
* @param loginName 登录名
* @param password 密码
* @param source 登录来源
* @return
*/
WorkUser login(String loginName, String password, String source);
/**
* 获取用户信息
* @param id 用户主键
* @return
*/
WorkUser getUserById(Integer id);
}
package cn.wisenergy.service.impl;
import cn.wisenergy.service.WorkCollectService;
import org.springframework.stereotype.Service;
/**
* <p>
* 服务实现类
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
@Service
public class WorkCollectServiceImpl implements WorkCollectService {
}
package cn.wisenergy.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.wisenergy.common.utils.exception.BASE_RESP_CODE_ENUM;
import cn.wisenergy.common.utils.exception.BaseCustomException;
import cn.wisenergy.mapper.WorkDeptMapper;
import cn.wisenergy.model.app.WorkDept;
import cn.wisenergy.model.app.WorkUser;
import cn.wisenergy.model.enums.ManagerEnum;
import cn.wisenergy.service.WorkDeptService;
import cn.wisenergy.service.WorkUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 服务实现类
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
@Service
@Slf4j
public class WorkDeptServiceImpl implements WorkDeptService {
@Autowired
WorkUserService workUserService;
@Autowired
WorkDeptMapper workDeptMapper;
@Override
public List<WorkDept> getDeptInfo(Integer userId, Integer deptId) {
log.info("WorkDeptServiceImpl[]getAllDeptInfo" + userId);
if (userId == null || deptId == null) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
}
//判断用户权限
WorkUser user = workUserService.getUserById(userId);
if (user.getLevel() == ManagerEnum.NOT_MANAGER.getCode()) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.THE_USER_NOT_MANAGER_PLASE_MANAGER_LOGIN);
}
//获取部门信息
List<WorkDept> workDepts = workDeptMapper.getDeptById(deptId);
if (CollectionUtil.isEmpty(workDepts)) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.DEPT_NOT_FOUND);
}
return workDepts;
}
}
package cn.wisenergy.service.impl;
import cn.wisenergy.service.WorkHolidayService;
import org.springframework.stereotype.Service;
/**
* <p>
* 服务实现类
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
@Service
public class WorkHolidayServiceImpl implements WorkHolidayService {
}
package cn.wisenergy.service.impl;
import cn.wisenergy.service.WorkProjectChangeService;
import org.springframework.stereotype.Service;
/**
* <p>
* 服务实现类
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
@Service
public class WorkProjectChangeServiceImpl implements WorkProjectChangeService {
}
package cn.wisenergy.service.impl;
import cn.wisenergy.common.utils.exception.BASE_RESP_CODE_ENUM;
import cn.wisenergy.common.utils.exception.BaseCustomException;
import cn.wisenergy.mapper.WorkProjectMapper;
import cn.wisenergy.model.app.WorkProject;
import cn.wisenergy.model.app.WorkUser;
import cn.wisenergy.model.enums.ManagerEnum;
import cn.wisenergy.service.WorkProjectService;
import cn.wisenergy.service.WorkUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
/**
* <p>
* 服务实现类
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
@Service
@Slf4j
public class WorkProjectServiceImpl implements WorkProjectService {
@Autowired
private WorkUserService workUserService;
@Autowired
private WorkProjectMapper workProjectMapper;
@Override
public List<WorkProject> getUserManageProjects(Integer userId) {
log.info("WorkProjectServiceImpl[]getUserManageProjects[]input.param" + userId);
if (userId == null) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
}
WorkUser user = workUserService.getUserById(userId);
List<WorkProject> workProjects = new ArrayList<>();
HashMap<String, Object> map = new HashMap<>();
if (user.getLevel() == ManagerEnum.IS_PROJECT_DIRECTOR.getCode()) {
map.put("managerId", userId);
workProjects = workProjectMapper.getProjectsByCriteria(map);
}
//用户是部门级别,查询该部门下的所有项目
if (user.getLevel() == ManagerEnum.IS_DEPARTMENT_DIRECTOR.getCode()) {
map.put("deptId", user.getDeptId());
workProjects = workProjectMapper.getProjectsByCriteria(map);
}
return workProjects;
}
}
package cn.wisenergy.service.impl;
import cn.wisenergy.service.WorkSbumitAdoptService;
import org.springframework.stereotype.Service;
/**
* <p>
* 服务实现类
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
@Service
public class WorkSbumitAdoptServiceImpl implements WorkSbumitAdoptService {
}
package cn.wisenergy.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.wisenergy.common.utils.DateUtil;
import cn.wisenergy.mapper.WorkTimeOrderMapper;
import cn.wisenergy.model.app.WorkProject;
import cn.wisenergy.model.app.WorkUser;
import cn.wisenergy.model.dto.ApprovalStatistics;
import cn.wisenergy.model.dto.MonthlyWorkingHoursStatistics;
import cn.wisenergy.model.enums.ManagerEnum;
import cn.wisenergy.model.enums.ProjectTypeEnum;
import cn.wisenergy.model.enums.WorkOrderStatus;
import cn.wisenergy.model.enums.WorkOrderType;
import cn.wisenergy.service.WorkProjectService;
import cn.wisenergy.service.WorkTimeOrderService;
import cn.wisenergy.service.WorkUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.*;
/**
* <p>
* 服务实现类
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
@Service
@Slf4j
public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
@Autowired
private WorkUserService workUserService;
@Autowired
private WorkProjectService workProjectService;
@Autowired
private WorkTimeOrderMapper workTimeOrderMapper;
@Override
public ArrayList<Object> getMonthlyStatistics(Integer userId) {
log.info("WorkTimeOrderServiceImpl[]getMonthlyStatistics[]input.param" + userId);
WorkUser user = workUserService.getUserById(userId);
//本月第一天
Date firstDayOfMonth = DateUtil.getCurrentFirstDayOfMonth();
//返回数据对象
ArrayList<Object> objects = new ArrayList<>();
//用户是项目或部门级别
if (user.getLevel() == ManagerEnum.IS_PROJECT_DIRECTOR.getCode() ||
user.getLevel() == ManagerEnum.IS_DEPARTMENT_DIRECTOR.getCode()) {
HashMap<String, Object> map = new HashMap<>();
//以审批人、审核状态、开始时间查询本月审批数量
map.put("reviewerId", userId);
map.put("status", WorkOrderStatus.ALREADY_AUDIT.getCode());
map.put("startDay", firstDayOfMonth);
Integer completedCount = workTimeOrderMapper.getCountByCondition(map);
//本月驳回未重报数量
map.replace("status", WorkOrderStatus.TURN_DOWN.getCode());
Integer rejectAndNotResubmit = workTimeOrderMapper.getCountByCondition(map);
//项目级别,获取所管理项目,
if (user.getLevel() == ManagerEnum.IS_PROJECT_DIRECTOR.getCode()) {
List<WorkProject> projects = workProjectService.getUserManageProjects(userId);
ArrayList<Integer> projectIds = new ArrayList<>();
for (WorkProject project : projects) {
projectIds.add(project.getId());
}
if (CollectionUtil.isNotEmpty(projectIds)) {
map.put("projectIds", projectIds);
}
}
//部门级别
if (user.getLevel() == ManagerEnum.IS_DEPARTMENT_DIRECTOR.getCode()) {
map.put("deptId", user.getDeptId());
//填报项目类型编码
int[] workOrderTypeArray = {WorkOrderType.EXTERNAL_WORK.getCode(), WorkOrderType.INTERNAL_WORK.getCode(), WorkOrderType.OTHER_NOT_PROJECT_BUSINESS.getCode()};
map.put("typeArray", workOrderTypeArray);
}
//待审核包括:新提交和重新提交的
ArrayList<Integer> statusArray = new ArrayList<>();
statusArray.add(WorkOrderStatus.WAIT_AUDIT.getCode());
statusArray.add(WorkOrderStatus.RE_SUBMIT.getCode());
map.remove("reviewerId");
map.remove("status");
map.put("statusArray", statusArray);
//本月未审批数量
Integer notCompletedCount = workTimeOrderMapper.getCountByCondition(map);
//所有查询结果封装进对象
ApprovalStatistics approvalStatistics = new ApprovalStatistics();
approvalStatistics.setApprovalCount(completedCount);
approvalStatistics.setRejectNotSubmit(rejectAndNotResubmit);
approvalStatistics.setNotApprovalCount(notCompletedCount);
objects.add(approvalStatistics);
}
//用户是普通用户或项目级别用户
ArrayList<MonthlyWorkingHoursStatistics> statisticsArrayList = new ArrayList<>();
if (user.getLevel() == ManagerEnum.NOT_MANAGER.getCode() ||
user.getLevel() == ManagerEnum.IS_PROJECT_DIRECTOR.getCode()) {
String currentDayOfMonth = DateUtil.convertDateToYMDStr(DateUtil.getCurrentFirstDayOfMonth());
//统计项目类型工单填报次数、总工时
MonthlyWorkingHoursStatistics statistics1 = workTimeOrderMapper.collectByProjectType(userId, ProjectTypeEnum.PROJECT.getCode(), currentDayOfMonth);
statisticsArrayList.add(statistics1);
//统计商机类型工单填报次数、总工时
MonthlyWorkingHoursStatistics statistics2 = workTimeOrderMapper.collectByProjectType(userId, ProjectTypeEnum.BUSINESS_OPPORTUNITY.getCode(), currentDayOfMonth);
statisticsArrayList.add(statistics2);
objects.add(statisticsArrayList);
}
return objects;
}
}
package cn.wisenergy.service.impl;
import cn.wisenergy.service.WorkUserDeptService;
import org.springframework.stereotype.Service;
/**
* <p>
* 服务实现类
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
@Service
public class WorkUserDeptServiceImpl implements WorkUserDeptService {
}
package cn.wisenergy.service.impl;
import cn.wisenergy.common.utils.exception.BASE_RESP_CODE_ENUM;
import cn.wisenergy.common.utils.exception.BaseCustomException;
import cn.wisenergy.mapper.WorkProjectMapper;
import cn.wisenergy.mapper.WorkUserProjectMapper;
import cn.wisenergy.model.app.WorkProject;
import cn.wisenergy.model.app.WorkUser;
import cn.wisenergy.model.enums.ManagerEnum;
import cn.wisenergy.service.WorkUserProjectService;
import cn.wisenergy.service.WorkUserService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 服务实现类
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
@Service
@Slf4j
public class WorkUserProjectServiceImpl implements WorkUserProjectService {
@Autowired
private WorkUserService workUserService;
@Autowired
WorkUserProjectMapper workUserProjectMapper;
@Autowired
WorkProjectMapper workProjectMapper;
@Override
public List<WorkProject> getUserManageProject(Integer userId) {
log.info("WorkUserProjectServiceImpl[]getUserManageProject[]input.param" + userId);
if (userId == null) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
}
WorkUser user = workUserService.getUserById(userId);
if (user.getLevel() != ManagerEnum.IS_PROJECT_DIRECTOR.getCode() || user.getLevel() != ManagerEnum.IS_DEPARTMENT_DIRECTOR.getCode()) {
return null;
}
QueryWrapper<WorkProject> wrapper = new QueryWrapper<>();
//项目负责人查看管理项目
if (user.getLevel() == ManagerEnum.IS_PROJECT_DIRECTOR.getCode()) {
wrapper.eq("manager_id", user.getId());
}
//部门负责人查看部门项目
if (user.getLevel() == ManagerEnum.IS_DEPARTMENT_DIRECTOR.getCode()) {
wrapper.eq("dept_id", user.getDeptId());
}
//项目未结
wrapper.eq("is_conclusion", 0);
//查询
List<WorkProject> workProjects = workProjectMapper.selectList(wrapper);
return workProjects;
}
}
package cn.wisenergy.service.impl;
import cn.wisenergy.common.utils.Md5Util;
import cn.wisenergy.common.utils.exception.BASE_RESP_CODE_ENUM;
import cn.wisenergy.common.utils.exception.BaseCustomException;
import cn.wisenergy.mapper.WorkDeptMapper;
import cn.wisenergy.mapper.WorkUserMapper;
import cn.wisenergy.model.app.WorkUser;
import cn.wisenergy.model.enums.ManagerEnum;
import cn.wisenergy.service.WorkUserService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashMap;
/**
* <p>
* 服务实现类
* </p>
*
* @author chenqi
* @since 2021-01-19
*/
@Service
@Slf4j
public class WorkUserServiceImpl implements WorkUserService {
@Autowired
private WorkUserMapper workUserMapper;
@Autowired
private WorkDeptMapper workDeptMapper;
private static final String LOGIN_SOURCE = "PC";
@Override
public WorkUser login(String loginName, String password, String source) {
log.info("WorkUserServiceImpl[]login[].input.param" + loginName + password + source);
if (StringUtils.isEmpty(loginName) || StringUtils.isEmpty(password)) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
}
//MD5加密
String md5Password = Md5Util.digestMD5(password);
HashMap<String, Object> map = new HashMap<>();
map.put("loginName", loginName);
map.put("password", md5Password);
WorkUser user = workUserMapper.getUserInfo(map);
if (null == user) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.USER_PHONE_IS_ERROR);
}
//如果登录来源是PC,判断用户是不是管理员
if (LOGIN_SOURCE.equals(source)) {
if (user.getLevel() == ManagerEnum.NOT_MANAGER.getCode()) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.THE_USER_NOT_MANAGER_PLASE_MANAGER_LOGIN);
}
}
return user;
}
@Override
public WorkUser getUserById(Integer userId) {
log.info("UserServiceImpl[]getUserById[]input.param.userId" + userId);
if (null == userId) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
}
WorkUser user = workUserMapper.getUserById(userId);
//查询失败
if (null == user) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.QUERY_USER_INFO_FAIL);
}
log.info("UserServiceImpl[]getUserById[]get.user.info.success");
return user;
}
}
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
</facet>
<facet type="web" name="Web">
<configuration>
<webroots />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" /> <output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" />
...@@ -14,7 +24,6 @@ ...@@ -14,7 +24,6 @@
<orderEntry type="module" module-name="wisenergy-common" /> <orderEntry type="module" module-name="wisenergy-common" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.5.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.5.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter: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-starter-logging:2.1.5.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
...@@ -37,6 +46,10 @@ ...@@ -37,6 +46,10 @@
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.0" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
<orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-undertow:2.1.5.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-undertow:2.1.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.undertow:undertow-core:2.0.20.Final" level="project" /> <orderEntry type="library" name="Maven: io.undertow:undertow-core:2.0.20.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.xnio:xnio-api:3.3.8.Final" level="project" /> <orderEntry type="library" name="Maven: org.jboss.xnio:xnio-api:3.3.8.Final" level="project" />
...@@ -70,26 +83,13 @@ ...@@ -70,26 +83,13 @@
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-test:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-test:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" /> <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
<orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.2" level="project" /> <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.5.RELEASE" level="project" />
<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.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.2" level="project" /> <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.2" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.4" level="project" /> <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.4" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.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-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-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.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: mysql:mysql-connector-java:8.0.16" level="project" /> <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.1.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.1.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.1.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.1.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.1.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.5.RELEASE" 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-spring-boot-starter:1.1.22" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" /> <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.5.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.5.RELEASE" level="project" />
...@@ -135,12 +135,24 @@ ...@@ -135,12 +135,24 @@
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.4.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.shiro:shiro-crypto-cipher:1.4.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.4.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-core:1.4.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.4.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.shiro:shiro-config-ogdl:1.4.0" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.3" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.4.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.shiro:shiro-event:1.4.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.4.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.shiro:shiro-spring:1.4.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.4.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.shiro:shiro-web:1.4.0" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.6.7" level="project" /> <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.6.7" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generator:3.4.1" level="project" />
<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: 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" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure: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-starter-jdbc:2.1.5.RELEASE" level="project" />
<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: 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-core:1.2.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
......
package cn.wisenergy.web.admin.controller.app;
import cn.wisenergy.service.WorkCollectService;
import cn.wisenergy.web.admin.controller.common.BaseController;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;
/**
* @Authotr:陈奇
* @QQ1799796883
*/
@RestController
@Api(tags = "小程序工单日历模块")
@Slf4j
public class WorkCollectController extends BaseController {
@Autowired
private WorkCollectService workCollectService;
}
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;
/**
* @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);
}
ArrayList<Object> monthlyStatistics = workOrderService.getMonthlyStatistics(userId);
return getResult(monthlyStatistics);
}
}
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.model.app.WorkUser;
import cn.wisenergy.service.WorkUserService;
import cn.wisenergy.web.admin.controller.common.BaseController;
import cn.wisenergy.web.admin.utils.CustomException;
import cn.wisenergy.web.admin.utils.RESP_CODE_ENUM;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @Authotr:陈奇
* @QQ1799796883
*/
@RestController
@Api(tags = "用户模块")
@Slf4j
public class WorkUserController extends BaseController {
@Autowired
private WorkUserService workUserService;
@ApiOperation(value = "获取用户信息", notes = "获取用户信息", httpMethod = "GET")
@ApiImplicitParam(name = "id", value = "用户id", dataType = "integer", required = true)
@GetMapping(value = "/getUserInfo")
public Result<WorkUser> getUserInfo(Integer id) {
log.info("UserController[]getUserInfo[]input.param.id" + id);
if (null == id) {
throw new CustomException(RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
}
WorkUser user = workUserService.getUserById(id);
return getResult(user);
}
@ApiOperation(value = "用户登录", notes = "用户登录", httpMethod = "GET")
@ApiImplicitParams({
@ApiImplicitParam(name = "loginName", value = "登录名", dataType = "string", required = true),
@ApiImplicitParam(name = "password", value = "密码", dataType = "string", required = true),
@ApiImplicitParam(name = "source", value = "登录来源:PC/WAP", dataType = "string", required = true)
})
@GetMapping(value = "login")
public Result<WorkUser> login(String loginName, String password, String source) {
log.info("WorkUserController[]login[]input.param" + loginName + password + source);
if (StringUtils.isEmpty(loginName) || StringUtils.isEmpty(password) || StringUtils.isEmpty(loginName)) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
}
WorkUser workUser = workUserService.login(loginName, password, source);
return getResult(workUser);
}
}
package cn.wisenergy.web.admin.controller.common;
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.web.admin.utils.CustomException;
import cn.wisenergy.web.admin.utils.RESP_CODE_ENUM;
import net.sf.json.JSONObject;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.ConversionNotSupportedException;
import org.springframework.beans.TypeMismatchException;
import org.springframework.http.converter.HttpMessageNotReadableException;
import org.springframework.http.converter.HttpMessageNotWritableException;
import org.springframework.web.HttpMediaTypeNotAcceptableException;
import org.springframework.web.HttpMediaTypeNotSupportedException;
import org.springframework.web.HttpRequestMethodNotSupportedException;
import org.springframework.web.bind.MissingServletRequestParameterException;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
/**
* 控制器基类
*
* @author wyy
* @date 2019年08月15日
*/
public abstract class BaseController {
private static final long serialVersionUID = -6344078923170236539L;
protected Logger log = LoggerFactory.getLogger(this.getClass());
/**
* 应用接口异常处理
*
* @param response Response相应对象
* @param ex
*/
@ResponseBody
@ExceptionHandler(Exception.class)
public void handleException(HttpServletResponse response, Exception ex) {
Class eClass = ex.getClass();
Result<Object> result = new Result<>();
result.setResult(Result.RESULT_FLG.FAIL.getValue());
if (!eClass.equals(BaseCustomException.class)) {
log.error(ExceptionUtils.getStackTrace(ex));
}
//以下异常中,除注释过的,其他异常可不关注
if (eClass.equals(MissingServletRequestParameterException.class)) {
addResCodeToMap(BASE_RESP_CODE_ENUM.MIS_REQ_PARAM, result);
} else if (eClass.equals(TypeMismatchException.class)) {
addResCodeToMap(BASE_RESP_CODE_ENUM.MIS_REQ_PARAM, result);
} else if (eClass.equals(HttpMessageNotReadableException.class)) {
addResCodeToMap(BASE_RESP_CODE_ENUM.MIS_REQ_PARAM, result);
} else if (eClass.equals(HttpRequestMethodNotSupportedException.class)) {
addResCodeToMap(BASE_RESP_CODE_ENUM.METHOD_NOT_SUPPORTED, result);
} else if (eClass.equals(HttpMediaTypeNotAcceptableException.class)) {
addResCodeToMap(BASE_RESP_CODE_ENUM.MEDIA_TYPE_NOT_ACCEPT, result);
} else if (eClass.equals(HttpMediaTypeNotSupportedException.class)) {
addResCodeToMap(BASE_RESP_CODE_ENUM.MEDIA_TYPE_NOT_SUPPORTED, result);
} else if (eClass.equals(ConversionNotSupportedException.class)) {
addResCodeToMap(BASE_RESP_CODE_ENUM.SERVER_ERROR, result);
} else if (eClass.equals(HttpMessageNotWritableException.class)) {
addResCodeToMap(BASE_RESP_CODE_ENUM.SERVER_ERROR, result);
} else if (eClass.equals(BaseCustomException.class)) { //系统业务异常
addExceptionToMap((BaseCustomException) ex, result);
} else if (eClass.equals(CustomException.class)) { //系统业务异常
CustomException ce = (CustomException) ex;
addExceptionToMap(new CustomException(ce.getErrorCode(), ce.getMessage()), result);
} else {
addResCodeToMap(BASE_RESP_CODE_ENUM.SERVER_ERROR, result);
}
// 错误相应编码回写
PrintWriter writer = null;
try {
response.setContentType("application/json; charset=UTF-8");
writer = response.getWriter();
writer.write(JSONObject.fromObject(result).toString());
writer.flush();
} catch (Exception e) {
IOUtils.closeQuietly(writer);
log.error("接口异常:{}", ExceptionUtils.getFullStackTrace(e));
}
}
/**
* 添加系统异常信息到map中
*
* @param responseCodeEnum 错误响应编码枚举类对象
* @param result 响应错误编码集合
*/
protected void addResCodeToMap(BASE_RESP_CODE_ENUM responseCodeEnum, Result<Object> result) {
result.setErrorCode(responseCodeEnum.getCode());
result.setErrorMsg(responseCodeEnum.getMsg());
}
/**
* 添加业务异常信息到map中
*
* @param responseCodeEnum 错误响应编码枚举类对象
* @param result 响应错误编码集合
*/
protected void addResCodeToMap(RESP_CODE_ENUM responseCodeEnum, Result<Object> result) {
result.setErrorCode(responseCodeEnum.getCode());
result.setErrorMsg(responseCodeEnum.getMsg());
}
/**
* 添加异常信息到map中
*
* @param baseCustomException 接口异常类
* @param result 接口异常集合
*/
protected void addExceptionToMap(BaseCustomException baseCustomException, Result<Object> result) {
result.setErrorCode(baseCustomException.getErrorCode());
result.setErrorMsg(baseCustomException.getErrorMsg());
}
/**
* 添加异常信息到map中
*
* @param customException 接口异常类
* @param result 接口异常集合
*/
protected void addExceptionToMap(CustomException customException, Result<Object> result) {
result.setErrorCode(customException.getErrorCode());
result.setErrorMsg(customException.getErrorMsg());
}
/**
* 添加数据到结果对象中
*
* @param data 封装接口集合参数
* @return
*/
public Result getResult(Object data) {
Result result = new Result();
result.setResult(Result.RESULT_FLG.SUCCESS.getValue());
result.setData(data);
return result;
}
}
package cn.wisenergy.web.admin.utils;
/**
* 接口异常对象
*/
public class CustomException extends RuntimeException {
private static final long serialVersionUID = -4974461182923482972L;
// 错误编码
private String errorCode;
// 错误编码信息
private String errorMsg;
/**
* 应用接口有参构造函数
*
* @param errorCode 错误编码
* @param errorMsg 错误信息
*/
public CustomException(String errorCode, String errorMsg) {
super("errorCode:" + errorCode + " errorMsg:" + errorMsg);
this.errorCode = errorCode;
this.errorMsg = errorMsg;
}
/**
* 应用接口有参构造函数
*
* @param respCodeEnum 基本响应枚举类
*/
public CustomException(RESP_CODE_ENUM respCodeEnum) {
super(respCodeEnum.getMsg());
this.errorCode = respCodeEnum.getCode();
this.errorMsg = respCodeEnum.getMsg();
}
/**
* 获取错误编码
*/
public String getErrorCode() {
return errorCode;
}
/**
* 设置错误编码
*/
public void setErrorCode(String errorCode) {
this.errorCode = errorCode;
}
/**
* 获取异常编码
*/
public String getErrorMsg() {
return errorMsg;
}
/**
* 设置异常编码
*/
public void setErrorMsg(String errorMsg) {
this.errorMsg = errorMsg;
}
}
package cn.wisenergy.web.admin.utils;
/**
* 响应编码
*/
public enum RESP_CODE_ENUM {
/* ******************** 业务自定义异常 ********************* */
RSA_PRIVATE_KEY_ERROR("1001", "生成RSA非对称加密公钥出错"),
RSA_NOT_EXIST("1002", "RSA非对称加密公钥不存在"),
RSA_DECRYPTION_ERROR("1003", "RSA解密错误"),
TOKEN_IS_NOT_EXIST("1004", "TOKEN已失效"),
REQUIRED_IDENTIFY_NOT_EXIST("1005", "请求标识对象不存在"),
ILLEGAL_PARAMETER("1006", "非法参数"),
MISS_PARAMETER("1007", "缺少必须的参数"),
ACCT_NOT_EXIST("1008", "账号不存在"),
ACCT_OR_ACCOPASS_ERROR("1009", "账号或密码错误"),
ACCT_HAS_FROZEN("1010", "账号已禁用"),
NOT_LOGIN_ERROR("1011", "用户未登录"),
CAPTCHA_CODE_INVALID("1012", "验证码失效"),
CAPTCHA_CODE_ERROR("1013", "验证码错误"),
NO_DATA("1014", "数据为空"),
CAPTCHA_EXIST("1015", "验证码已发送,请稍等"),
LOGIN_FAILURE("1016", "登录已失效,请重新登录"),
PHONE_ERROE("1017", "绑定手机号错误"),
RECORD_WORD_ADD_FAIL("1018", "字段添加失败"),
INPUT_PARAM_IS_NULL("1019", "入参为空"),
CREATE_WORK_ORDER_FAIL("1020", "创建工单失败"),
QUERY_WORK_ORDER_INFO_FAIL("1021", "获取工单信息失败"),
QUERY_WORK_ORDER_LISt_FAIL("1021", "获取工单列表失败"),
AUDIT_WORK_ORDER_FAIL("1022","审核工单失败"),
QUERY_USER_INFO_FAIL("1023","获取用户信息失败")
;
// 错误编码
private String code;
// 错误信息
private String msg;
// 相应编码有参构造函数
RESP_CODE_ENUM(String code, String msg) {
this.code = code;
this.msg = msg;
}
/**
* 获取编码
*/
public String getCode() {
return code;
}
/**
* 设置编码
*/
public void setCode(String code) {
this.code = code;
}
/**
* 获取编码信息
*/
public String getMsg() {
return msg;
}
/**
* 设置编码信息
*/
public void setMsg(String msg) {
this.msg = msg;
}
}
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
</facet>
<facet type="web" name="Web">
<configuration>
<webroots />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" /> <output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" />
...@@ -16,7 +26,6 @@ ...@@ -16,7 +26,6 @@
<orderEntry type="module" module-name="wisenergy-common" /> <orderEntry type="module" module-name="wisenergy-common" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.5.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.5.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter: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-starter-logging:2.1.5.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" /> <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
...@@ -39,6 +48,8 @@ ...@@ -39,6 +48,8 @@
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: net.sf.json-lib:json-lib:jdk15:2.4" level="project" />
<orderEntry type="library" name="Maven: net.sf.ezmorph:ezmorph:1.0.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-undertow:2.1.5.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-undertow:2.1.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.undertow:undertow-core:2.0.20.Final" level="project" /> <orderEntry type="library" name="Maven: io.undertow:undertow-core:2.0.20.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.xnio:xnio-api:3.3.8.Final" level="project" /> <orderEntry type="library" name="Maven: org.jboss.xnio:xnio-api:3.3.8.Final" level="project" />
...@@ -72,26 +83,13 @@ ...@@ -72,26 +83,13 @@
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-test:5.1.7.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-test:5.1.7.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" /> <orderEntry type="library" name="Maven: org.xmlunit:xmlunit-core:2.6.2" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
<orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
<orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.2" level="project" /> <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.5.RELEASE" level="project" />
<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.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.2" level="project" /> <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.2" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.4" level="project" /> <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.4" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.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-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-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.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: mysql:mysql-connector-java:8.0.16" level="project" /> <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.16" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.1.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.1.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.1.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.1.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.1.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.5.RELEASE" 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-spring-boot-starter:1.1.22" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" /> <orderEntry type="library" name="Maven: com.alibaba:druid:1.1.22" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.5.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.5.RELEASE" level="project" />
...@@ -130,6 +128,20 @@ ...@@ -130,6 +128,20 @@
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
<orderEntry type="library" name="Maven: joda-time:joda-time:2.10.2" level="project" /> <orderEntry type="library" name="Maven: joda-time:joda-time:2.10.2" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.6.7" level="project" /> <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.6.7" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-generator:3.4.1" level="project" />
<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: 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" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure: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-starter-jdbc:2.1.5.RELEASE" level="project" />
<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: 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-core:1.2.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment