清理

common/pom.xml

@@ -3,8 +3,8 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>supervision-server</artifactId>
-        <groupId>com.jpsoft.supervision</groupId>
+        <artifactId>machinery-server</artifactId>
+        <groupId>com.jpsoft.machinery</groupId>
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

common/src/main/java/com/jpsoft/supervision/config/BaiduConfig.java → common/src/main/java/com/jpsoft/machinery/config/BaiduConfig.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.config;
+package com.jpsoft.machinery.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

common/src/main/java/com/jpsoft/supervision/config/OSSConfig.java → common/src/main/java/com/jpsoft/machinery/config/OSSConfig.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.config;
+package com.jpsoft.machinery.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

common/src/main/java/com/jpsoft/supervision/config/WechatConfig.java → common/src/main/java/com/jpsoft/machinery/config/WechatConfig.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.config;
+package com.jpsoft.machinery.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

common/src/main/java/com/jpsoft/supervision/modules/common/dto/MessageResult.java → common/src/main/java/com/jpsoft/machinery/modules/common/dto/MessageResult.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.dto;
+package com.jpsoft.machinery.modules.common.dto;
 
 public class MessageResult<T> {
 	private boolean result;

common/src/main/java/com/jpsoft/supervision/modules/common/dto/Sort.java → common/src/main/java/com/jpsoft/machinery/modules/common/dto/Sort.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.dto;
+package com.jpsoft.machinery.modules.common.dto;
 
 import java.io.Serializable;
 

common/src/main/java/com/jpsoft/supervision/modules/common/service/BaseService.java → common/src/main/java/com/jpsoft/machinery/modules/common/service/BaseService.java

@@ -1,7 +1,7 @@
-package com.jpsoft.supervision.modules.common.service;
+package com.jpsoft.machinery.modules.common.service;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.common.dto.Sort;
 
 import java.util.List;
 import java.util.Map;

common/src/main/java/com/jpsoft/supervision/modules/common/service/IRedisService.java → common/src/main/java/com/jpsoft/machinery/modules/common/service/IRedisService.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.service;
+package com.jpsoft.machinery.modules.common.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.HashOperations;

common/src/main/java/com/jpsoft/supervision/modules/common/service/impl/RedisServiceImpl.java → common/src/main/java/com/jpsoft/machinery/modules/common/service/impl/RedisServiceImpl.java

@@ -1,6 +1,6 @@
-package com.jpsoft.supervision.modules.common.service.impl;
+package com.jpsoft.machinery.modules.common.service.impl;
 
-import com.jpsoft.supervision.modules.common.service.IRedisService;
+import com.jpsoft.machinery.modules.common.service.IRedisService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 

common/src/main/java/com/jpsoft/supervision/modules/common/utils/AESUtil.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/AESUtil.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.utils;
+package com.jpsoft.machinery.modules.common.utils;
 
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 

common/src/main/java/com/jpsoft/supervision/modules/common/utils/BASE64DecodedMultipartFile.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/BASE64DecodedMultipartFile.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.utils;
+package com.jpsoft.machinery.modules.common.utils;
 
 import org.springframework.web.multipart.MultipartFile;
 import sun.misc.BASE64Decoder;

common/src/main/java/com/jpsoft/supervision/modules/common/utils/BaiduOCR.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/BaiduOCR.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.utils;
+package com.jpsoft.machinery.modules.common.utils;
 
 import net.sf.json.JSONObject;
 

common/src/main/java/com/jpsoft/supervision/modules/common/utils/Base64.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/Base64.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.utils;
+package com.jpsoft.machinery.modules.common.utils;
 
 public final class Base64 {
 

common/src/main/java/com/jpsoft/supervision/modules/common/utils/CheckIdCard.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/CheckIdCard.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.utils;
+package com.jpsoft.machinery.modules.common.utils;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;

common/src/main/java/com/jpsoft/supervision/modules/common/utils/DES3.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/DES3.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.utils;
+package com.jpsoft.machinery.modules.common.utils;
 
 import javax.crypto.Cipher;
 import javax.crypto.SecretKeyFactory;

common/src/main/java/com/jpsoft/supervision/modules/common/utils/FileUtil.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/FileUtil.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.utils;
+package com.jpsoft.machinery.modules.common.utils;
 
 import java.io.*;
 

common/src/main/java/com/jpsoft/supervision/modules/common/utils/Generator/AbstractCaptchaA.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/Generator/AbstractCaptchaA.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.utils.Generator;
+package com.jpsoft.machinery.modules.common.utils.Generator;
 
 import cn.hutool.captcha.ICaptcha;
 import cn.hutool.captcha.generator.CodeGenerator;

common/src/main/java/com/jpsoft/supervision/modules/common/utils/Generator/AbstractGeneratorA.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/Generator/AbstractGeneratorA.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.utils.Generator;
+package com.jpsoft.machinery.modules.common.utils.Generator;
 
 import cn.hutool.captcha.generator.CodeGenerator;
 

common/src/main/java/com/jpsoft/supervision/modules/common/utils/Generator/CaptchaUtilA.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/Generator/CaptchaUtilA.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.utils.Generator;
+package com.jpsoft.machinery.modules.common.utils.Generator;
 
 import cn.hutool.captcha.CircleCaptcha;
 import cn.hutool.captcha.LineCaptcha;

common/src/main/java/com/jpsoft/supervision/modules/common/utils/Generator/CircleCaptchaA.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/Generator/CircleCaptchaA.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.utils.Generator;
+package com.jpsoft.machinery.modules.common.utils.Generator;
 
 import cn.hutool.core.img.GraphicsUtil;
 import cn.hutool.core.img.ImgUtil;

common/src/main/java/com/jpsoft/supervision/modules/common/utils/Generator/RandomGeneratorA.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/Generator/RandomGeneratorA.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.utils.Generator;
+package com.jpsoft.machinery.modules.common.utils.Generator;
 
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;

common/src/main/java/com/jpsoft/supervision/modules/common/utils/HttpConnectionUtil.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/HttpConnectionUtil.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.utils;
+package com.jpsoft.machinery.modules.common.utils;
 
 import net.sf.json.JSONObject;
 import org.apache.http.HttpEntity;

common/src/main/java/com/jpsoft/supervision/modules/common/utils/HttpUtil.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/HttpUtil.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.utils;
+package com.jpsoft.machinery.modules.common.utils;
 
 import lombok.extern.slf4j.Slf4j;
 

common/src/main/java/com/jpsoft/supervision/modules/common/utils/MyX509TrustManager.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/MyX509TrustManager.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.utils;
+package com.jpsoft.machinery.modules.common.utils;
 
 import javax.net.ssl.X509TrustManager;
 import java.security.cert.CertificateException;

common/src/main/java/com/jpsoft/supervision/modules/common/utils/OSSUtil.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/OSSUtil.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.utils;
+package com.jpsoft.machinery.modules.common.utils;
 
 import cn.hutool.core.codec.Base64Encoder;
 import cn.hutool.core.date.DateTime;
@@ -8,7 +8,7 @@ import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.model.GeneratePresignedUrlRequest;
 import com.aliyun.oss.model.OSSObject;
 import com.aliyun.oss.model.PutObjectResult;
-import com.jpsoft.supervision.config.OSSConfig;
+import com.jpsoft.machinery.config.OSSConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 

common/src/main/java/com/jpsoft/supervision/modules/common/utils/POIUtils.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/POIUtils.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.utils;
+package com.jpsoft.machinery.modules.common.utils;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.converter.ExcelToHtmlConverter;

common/src/main/java/com/jpsoft/supervision/modules/common/utils/PojoUtils.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/PojoUtils.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.utils;
+package com.jpsoft.machinery.modules.common.utils;
 
 import com.github.dozermapper.core.DozerBeanMapperBuilder;
 import com.github.dozermapper.core.Mapper;

common/src/main/java/com/jpsoft/supervision/modules/common/utils/SMSUtil.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/SMSUtil.java

@@ -1,6 +1,6 @@
-package com.jpsoft.supervision.modules.common.utils;
+package com.jpsoft.machinery.modules.common.utils;
 
-import com.jpsoft.supervision.modules.common.dto.MessageResult;
+import com.jpsoft.machinery.modules.common.dto.MessageResult;
 import com.taobao.api.ApiException;
 import com.taobao.api.DefaultTaobaoClient;
 import com.taobao.api.TaobaoClient;

common/src/main/java/com/jpsoft/supervision/modules/common/utils/Sign.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/Sign.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.utils;
+package com.jpsoft.machinery.modules.common.utils;
 
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;

common/src/main/java/com/jpsoft/supervision/modules/common/utils/StringUtils.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/StringUtils.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.utils;
+package com.jpsoft.machinery.modules.common.utils;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;

common/src/main/java/com/jpsoft/supervision/modules/common/utils/TimeZonesUtil.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/TimeZonesUtil.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.utils;
+package com.jpsoft.machinery.modules.common.utils;
 
 /**
  * @author 墨鱼_mo

common/src/main/java/com/jpsoft/supervision/modules/common/utils/WechatMessageUtil.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/WechatMessageUtil.java

@@ -1,6 +1,6 @@
-package com.jpsoft.supervision.modules.common.utils;
+package com.jpsoft.machinery.modules.common.utils;
 
-import com.jpsoft.supervision.modules.wechat.entity.AccessToken;
+import com.jpsoft.machinery.modules.wechat.entity.AccessToken;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;

common/src/main/java/com/jpsoft/supervision/modules/common/utils/WeixinUtil.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/WeixinUtil.java

@@ -1,8 +1,8 @@
-package com.jpsoft.supervision.modules.common.utils;
+package com.jpsoft.machinery.modules.common.utils;
 
 import cn.hutool.core.date.DateTime;
-import com.jpsoft.supervision.modules.wechat.entity.AccessToken;
-import com.jpsoft.supervision.modules.wechat.vo.UserInfo;
+import com.jpsoft.machinery.modules.wechat.entity.AccessToken;
+import com.jpsoft.machinery.modules.wechat.vo.UserInfo;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONException;
 import net.sf.json.JSONObject;

common/src/main/java/com/jpsoft/supervision/modules/common/utils/enterprise/AesException.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/enterprise/AesException.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.utils.enterprise;
+package com.jpsoft.machinery.modules.common.utils.enterprise;
 
 /**
  * @author 墨鱼_mo

common/src/main/java/com/jpsoft/supervision/modules/common/utils/enterprise/ByteGroup.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/enterprise/ByteGroup.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.utils.enterprise;
+package com.jpsoft.machinery.modules.common.utils.enterprise;
 
 import java.util.ArrayList;
 

common/src/main/java/com/jpsoft/supervision/modules/common/utils/enterprise/PKCS7Encoder.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/enterprise/PKCS7Encoder.java

@@ -6,7 +6,7 @@
 
 // ------------------------------------------------------------------------
 
-package com.jpsoft.supervision.modules.common.utils.enterprise;
+package com.jpsoft.machinery.modules.common.utils.enterprise;
 
 import java.nio.charset.Charset;
 import java.util.Arrays;

common/src/main/java/com/jpsoft/supervision/modules/common/utils/enterprise/SHA1.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/enterprise/SHA1.java

@@ -6,7 +6,7 @@
 
 // ------------------------------------------------------------------------
 
-package com.jpsoft.supervision.modules.common.utils.enterprise;
+package com.jpsoft.machinery.modules.common.utils.enterprise;
 
 import java.security.MessageDigest;
 import java.util.Arrays;

common/src/main/java/com/jpsoft/supervision/modules/common/utils/enterprise/WXBizMsgCrypt.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/enterprise/WXBizMsgCrypt.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.common.utils.enterprise; /**
+package com.jpsoft.machinery.modules.common.utils.enterprise; /**
  * 对公众平台发送给公众账号的消息加解密示例代码.
  *
  * @copyright Copyright (c) 1998-2014 Tencent Inc.

common/src/main/java/com/jpsoft/supervision/modules/common/utils/enterprise/XMLParse.java → common/src/main/java/com/jpsoft/machinery/modules/common/utils/enterprise/XMLParse.java

@@ -6,7 +6,7 @@
 
 // ------------------------------------------------------------------------
 
-package com.jpsoft.supervision.modules.common.utils.enterprise;
+package com.jpsoft.machinery.modules.common.utils.enterprise;
 
 import java.io.StringReader;
 

common/src/main/java/com/jpsoft/supervision/modules/sys/dao/DataDictionaryDAO.java → common/src/main/java/com/jpsoft/machinery/modules/sys/dao/DataDictionaryDAO.java

@@ -1,7 +1,7 @@
-package com.jpsoft.supervision.modules.sys.dao;
+package com.jpsoft.machinery.modules.sys.dao;
 
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.jpsoft.supervision.modules.sys.entity.DataDictionary;
+import com.jpsoft.machinery.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.sys.entity.DataDictionary;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

common/src/main/java/com/jpsoft/supervision/modules/sys/dao/MenuDAO.java → common/src/main/java/com/jpsoft/machinery/modules/sys/dao/MenuDAO.java

@@ -1,12 +1,12 @@
-package com.jpsoft.supervision.modules.sys.dao;
+package com.jpsoft.machinery.modules.sys.dao;
 
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
-import com.jpsoft.supervision.modules.sys.entity.Menu;
+import com.jpsoft.machinery.modules.sys.entity.Menu;
 import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.common.dto.Sort;
 
 @Repository
 public interface MenuDAO {

common/src/main/java/com/jpsoft/supervision/modules/sys/dao/PermissionDAO.java → common/src/main/java/com/jpsoft/machinery/modules/sys/dao/PermissionDAO.java

@@ -1,12 +1,12 @@
-package com.jpsoft.supervision.modules.sys.dao;
+package com.jpsoft.machinery.modules.sys.dao;
 
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
-import com.jpsoft.supervision.modules.sys.entity.Permission;
+import com.jpsoft.machinery.modules.sys.entity.Permission;
 import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.common.dto.Sort;
 
 @Repository
 public interface PermissionDAO {

common/src/main/java/com/jpsoft/supervision/modules/sys/dao/RoleDAO.java → common/src/main/java/com/jpsoft/machinery/modules/sys/dao/RoleDAO.java

@@ -1,10 +1,10 @@
-package com.jpsoft.supervision.modules.sys.dao;
+package com.jpsoft.machinery.modules.sys.dao;
 
 import java.util.List;
 import org.springframework.stereotype.Repository;
-import com.jpsoft.supervision.modules.sys.entity.Role;
+import com.jpsoft.machinery.modules.sys.entity.Role;
 import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.common.dto.Sort;
 
 @Repository
 public interface RoleDAO {

common/src/main/java/com/jpsoft/supervision/modules/sys/dao/RoleMenuDAO.java → common/src/main/java/com/jpsoft/machinery/modules/sys/dao/RoleMenuDAO.java

@@ -1,10 +1,10 @@
-package com.jpsoft.supervision.modules.sys.dao;
+package com.jpsoft.machinery.modules.sys.dao;
 
 import java.util.List;
 import org.springframework.stereotype.Repository;
-import com.jpsoft.supervision.modules.sys.entity.RoleMenu;
+import com.jpsoft.machinery.modules.sys.entity.RoleMenu;
 import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.common.dto.Sort;
 
 @Repository
 public interface RoleMenuDAO {

common/src/main/java/com/jpsoft/supervision/modules/sys/dao/RolePermissionDAO.java → common/src/main/java/com/jpsoft/machinery/modules/sys/dao/RolePermissionDAO.java

@@ -1,10 +1,10 @@
-package com.jpsoft.supervision.modules.sys.dao;
+package com.jpsoft.machinery.modules.sys.dao;
 
 import java.util.List;
 import org.springframework.stereotype.Repository;
-import com.jpsoft.supervision.modules.sys.entity.RolePermission;
+import com.jpsoft.machinery.modules.sys.entity.RolePermission;
 import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.common.dto.Sort;
 
 @Repository
 public interface RolePermissionDAO {

common/src/main/java/com/jpsoft/supervision/modules/sys/dao/SysLogDAO.java → common/src/main/java/com/jpsoft/machinery/modules/sys/dao/SysLogDAO.java

@@ -1,7 +1,7 @@
-package com.jpsoft.supervision.modules.sys.dao;
+package com.jpsoft.machinery.modules.sys.dao;
 
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.jpsoft.supervision.modules.sys.entity.SysLog;
+import com.jpsoft.machinery.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.sys.entity.SysLog;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

common/src/main/java/com/jpsoft/supervision/modules/sys/dao/UserDAO.java → common/src/main/java/com/jpsoft/machinery/modules/sys/dao/UserDAO.java

@@ -1,12 +1,12 @@
-package com.jpsoft.supervision.modules.sys.dao;
+package com.jpsoft.machinery.modules.sys.dao;
 
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
-import com.jpsoft.supervision.modules.sys.entity.User;
+import com.jpsoft.machinery.modules.sys.entity.User;
 import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.common.dto.Sort;
 
 @Repository
 public interface UserDAO {

common/src/main/java/com/jpsoft/supervision/modules/sys/dao/UserRoleDAO.java → common/src/main/java/com/jpsoft/machinery/modules/sys/dao/UserRoleDAO.java

@@ -1,12 +1,12 @@
-package com.jpsoft.supervision.modules.sys.dao;
+package com.jpsoft.machinery.modules.sys.dao;
 
 import java.util.List;
 
-import com.jpsoft.supervision.modules.sys.entity.Role;
+import com.jpsoft.machinery.modules.sys.entity.Role;
 import org.springframework.stereotype.Repository;
-import com.jpsoft.supervision.modules.sys.entity.UserRole;
+import com.jpsoft.machinery.modules.sys.entity.UserRole;
 import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.common.dto.Sort;
 
 @Repository
 public interface UserRoleDAO {

common/src/main/java/com/jpsoft/supervision/modules/sys/dto/RoleRelatedDTO.java → common/src/main/java/com/jpsoft/machinery/modules/sys/dto/RoleRelatedDTO.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.sys.dto;
+package com.jpsoft.machinery.modules.sys.dto;
 
 import java.util.List;
 

common/src/main/java/com/jpsoft/supervision/modules/sys/entity/DataDictionary.java → common/src/main/java/com/jpsoft/machinery/modules/sys/entity/DataDictionary.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.sys.entity;
+package com.jpsoft.machinery.modules.sys.entity;
 
 import java.util.Date;
 

common/src/main/java/com/jpsoft/supervision/modules/sys/entity/Menu.java → common/src/main/java/com/jpsoft/machinery/modules/sys/entity/Menu.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.sys.entity;
+package com.jpsoft.machinery.modules.sys.entity;
 
 import java.util.Date;
 import java.util.List;

common/src/main/java/com/jpsoft/supervision/modules/sys/entity/Permission.java → common/src/main/java/com/jpsoft/machinery/modules/sys/entity/Permission.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.sys.entity;
+package com.jpsoft.machinery.modules.sys.entity;
 
 import java.util.Date;
 import org.springframework.format.annotation.DateTimeFormat;

common/src/main/java/com/jpsoft/supervision/modules/sys/entity/Role.java → common/src/main/java/com/jpsoft/machinery/modules/sys/entity/Role.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.sys.entity;
+package com.jpsoft.machinery.modules.sys.entity;
 
 import java.util.Date;
 

common/src/main/java/com/jpsoft/supervision/modules/sys/entity/RoleMenu.java → common/src/main/java/com/jpsoft/machinery/modules/sys/entity/RoleMenu.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.sys.entity;
+package com.jpsoft.machinery.modules.sys.entity;
 
 import java.util.Date;
 

common/src/main/java/com/jpsoft/supervision/modules/sys/entity/RolePermission.java → common/src/main/java/com/jpsoft/machinery/modules/sys/entity/RolePermission.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.sys.entity;
+package com.jpsoft.machinery.modules.sys.entity;
 
 import java.util.Date;
 

common/src/main/java/com/jpsoft/supervision/modules/sys/entity/SysLog.java → common/src/main/java/com/jpsoft/machinery/modules/sys/entity/SysLog.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.sys.entity;
+package com.jpsoft.machinery.modules.sys.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

common/src/main/java/com/jpsoft/supervision/modules/sys/entity/User.java → common/src/main/java/com/jpsoft/machinery/modules/sys/entity/User.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.sys.entity;
+package com.jpsoft.machinery.modules.sys.entity;
 
 import java.util.Date;
 import java.util.List;

common/src/main/java/com/jpsoft/supervision/modules/sys/entity/UserRole.java → common/src/main/java/com/jpsoft/machinery/modules/sys/entity/UserRole.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.sys.entity;
+package com.jpsoft.machinery.modules.sys.entity;
 
 import java.util.Date;
 

common/src/main/java/com/jpsoft/supervision/modules/sys/service/DataDictionaryService.java → common/src/main/java/com/jpsoft/machinery/modules/sys/service/DataDictionaryService.java

@@ -1,8 +1,8 @@
-package com.jpsoft.supervision.modules.sys.service;
+package com.jpsoft.machinery.modules.sys.service;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.sys.entity.DataDictionary;
-import com.jpsoft.supervision.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.sys.entity.DataDictionary;
+import com.jpsoft.machinery.modules.common.dto.Sort;
 
 import java.util.List;
 import java.util.Map;

common/src/main/java/com/jpsoft/supervision/modules/sys/service/MenuService.java → common/src/main/java/com/jpsoft/machinery/modules/sys/service/MenuService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.supervision.modules.sys.service;
+package com.jpsoft.machinery.modules.sys.service;
 
 import java.util.List;
 import java.util.Map;
-import com.jpsoft.supervision.modules.sys.entity.Menu;
+import com.jpsoft.machinery.modules.sys.entity.Menu;
 import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.common.dto.Sort;
 
 public interface MenuService {
 	Menu get(String id);

common/src/main/java/com/jpsoft/supervision/modules/sys/service/PermissionService.java → common/src/main/java/com/jpsoft/machinery/modules/sys/service/PermissionService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.supervision.modules.sys.service;
+package com.jpsoft.machinery.modules.sys.service;
 
 import java.util.List;
 import java.util.Map;
-import com.jpsoft.supervision.modules.sys.entity.Permission;
+import com.jpsoft.machinery.modules.sys.entity.Permission;
 import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.common.dto.Sort;
 
 public interface PermissionService {
 	Permission get(String id);

common/src/main/java/com/jpsoft/supervision/modules/sys/service/RoleMenuService.java → common/src/main/java/com/jpsoft/machinery/modules/sys/service/RoleMenuService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.supervision.modules.sys.service;
+package com.jpsoft.machinery.modules.sys.service;
 
 import java.util.List;
 import java.util.Map;
-import com.jpsoft.supervision.modules.sys.entity.RoleMenu;
+import com.jpsoft.machinery.modules.sys.entity.RoleMenu;
 import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.common.dto.Sort;
 
 public interface RoleMenuService {
 	RoleMenu get(String id);

common/src/main/java/com/jpsoft/supervision/modules/sys/service/RolePermissionService.java → common/src/main/java/com/jpsoft/machinery/modules/sys/service/RolePermissionService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.supervision.modules.sys.service;
+package com.jpsoft.machinery.modules.sys.service;
 
 import java.util.List;
 import java.util.Map;
-import com.jpsoft.supervision.modules.sys.entity.RolePermission;
+import com.jpsoft.machinery.modules.sys.entity.RolePermission;
 import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.common.dto.Sort;
 
 public interface RolePermissionService {
 	RolePermission get(String id);

common/src/main/java/com/jpsoft/supervision/modules/sys/service/RoleService.java → common/src/main/java/com/jpsoft/machinery/modules/sys/service/RoleService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.supervision.modules.sys.service;
+package com.jpsoft.machinery.modules.sys.service;
 
 import java.util.List;
 import java.util.Map;
-import com.jpsoft.supervision.modules.sys.entity.Role;
+import com.jpsoft.machinery.modules.sys.entity.Role;
 import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.common.dto.Sort;
 
 public interface RoleService {
 	Role get(String id);

common/src/main/java/com/jpsoft/supervision/modules/sys/service/SysLogService.java → common/src/main/java/com/jpsoft/machinery/modules/sys/service/SysLogService.java

@@ -1,8 +1,8 @@
-package com.jpsoft.supervision.modules.sys.service;
+package com.jpsoft.machinery.modules.sys.service;
 
 import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.jpsoft.supervision.modules.sys.entity.SysLog;
+import com.jpsoft.machinery.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.sys.entity.SysLog;
 
 import java.util.List;
 import java.util.Map;

common/src/main/java/com/jpsoft/supervision/modules/sys/service/UserRoleService.java → common/src/main/java/com/jpsoft/machinery/modules/sys/service/UserRoleService.java

@@ -1,12 +1,12 @@
-package com.jpsoft.supervision.modules.sys.service;
+package com.jpsoft.machinery.modules.sys.service;
 
 import java.util.List;
 import java.util.Map;
 
-import com.jpsoft.supervision.modules.sys.entity.Role;
-import com.jpsoft.supervision.modules.sys.entity.UserRole;
+import com.jpsoft.machinery.modules.sys.entity.Role;
+import com.jpsoft.machinery.modules.sys.entity.UserRole;
 import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.common.dto.Sort;
 
 public interface UserRoleService {
 	UserRole get(String id);

common/src/main/java/com/jpsoft/supervision/modules/sys/service/UserService.java → common/src/main/java/com/jpsoft/machinery/modules/sys/service/UserService.java

@@ -1,10 +1,10 @@
-package com.jpsoft.supervision.modules.sys.service;
+package com.jpsoft.machinery.modules.sys.service;
 
 import java.util.List;
 import java.util.Map;
-import com.jpsoft.supervision.modules.sys.entity.User;
+import com.jpsoft.machinery.modules.sys.entity.User;
 import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.common.dto.Sort;
 
 public interface UserService {
 	User get(String id);

common/src/main/java/com/jpsoft/supervision/modules/sys/service/impl/DataDictionaryServiceImpl.java → common/src/main/java/com/jpsoft/machinery/modules/sys/service/impl/DataDictionaryServiceImpl.java

@@ -1,11 +1,11 @@
-package com.jpsoft.supervision.modules.sys.service.impl;
+package com.jpsoft.machinery.modules.sys.service.impl;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.jpsoft.supervision.modules.sys.dao.DataDictionaryDAO;
-import com.jpsoft.supervision.modules.sys.entity.DataDictionary;
-import com.jpsoft.supervision.modules.sys.service.DataDictionaryService;
+import com.jpsoft.machinery.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.sys.dao.DataDictionaryDAO;
+import com.jpsoft.machinery.modules.sys.entity.DataDictionary;
+import com.jpsoft.machinery.modules.sys.service.DataDictionaryService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 

common/src/main/java/com/jpsoft/supervision/modules/sys/service/impl/MenuServiceImpl.java → common/src/main/java/com/jpsoft/machinery/modules/sys/service/impl/MenuServiceImpl.java

@@ -1,15 +1,15 @@
-package com.jpsoft.supervision.modules.sys.service.impl;
+package com.jpsoft.machinery.modules.sys.service.impl;
 
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.supervision.modules.sys.dao.MenuDAO;
-import com.jpsoft.supervision.modules.sys.entity.Menu;
-import com.jpsoft.supervision.modules.sys.service.MenuService;
+import com.jpsoft.machinery.modules.sys.dao.MenuDAO;
+import com.jpsoft.machinery.modules.sys.entity.Menu;
+import com.jpsoft.machinery.modules.sys.service.MenuService;
 import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

common/src/main/java/com/jpsoft/supervision/modules/sys/service/impl/PermissionServiceImpl.java → common/src/main/java/com/jpsoft/machinery/modules/sys/service/impl/PermissionServiceImpl.java

@@ -1,15 +1,15 @@
-package com.jpsoft.supervision.modules.sys.service.impl;
+package com.jpsoft.machinery.modules.sys.service.impl;
 
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.supervision.modules.sys.dao.PermissionDAO;
-import com.jpsoft.supervision.modules.sys.entity.Permission;
-import com.jpsoft.supervision.modules.sys.service.PermissionService;
+import com.jpsoft.machinery.modules.sys.dao.PermissionDAO;
+import com.jpsoft.machinery.modules.sys.entity.Permission;
+import com.jpsoft.machinery.modules.sys.service.PermissionService;
 import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

common/src/main/java/com/jpsoft/supervision/modules/sys/service/impl/RoleMenuServiceImpl.java → common/src/main/java/com/jpsoft/machinery/modules/sys/service/impl/RoleMenuServiceImpl.java

@@ -1,15 +1,15 @@
-package com.jpsoft.supervision.modules.sys.service.impl;
+package com.jpsoft.machinery.modules.sys.service.impl;
 
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.supervision.modules.sys.dao.RoleMenuDAO;
-import com.jpsoft.supervision.modules.sys.entity.RoleMenu;
-import com.jpsoft.supervision.modules.sys.service.RoleMenuService;
+import com.jpsoft.machinery.modules.sys.dao.RoleMenuDAO;
+import com.jpsoft.machinery.modules.sys.entity.RoleMenu;
+import com.jpsoft.machinery.modules.sys.service.RoleMenuService;
 import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

common/src/main/java/com/jpsoft/supervision/modules/sys/service/impl/RolePermissionServiceImpl.java → common/src/main/java/com/jpsoft/machinery/modules/sys/service/impl/RolePermissionServiceImpl.java

@@ -1,15 +1,15 @@
-package com.jpsoft.supervision.modules.sys.service.impl;
+package com.jpsoft.machinery.modules.sys.service.impl;
 
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.supervision.modules.sys.dao.RolePermissionDAO;
-import com.jpsoft.supervision.modules.sys.entity.RolePermission;
-import com.jpsoft.supervision.modules.sys.service.RolePermissionService;
+import com.jpsoft.machinery.modules.sys.dao.RolePermissionDAO;
+import com.jpsoft.machinery.modules.sys.entity.RolePermission;
+import com.jpsoft.machinery.modules.sys.service.RolePermissionService;
 import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

common/src/main/java/com/jpsoft/supervision/modules/sys/service/impl/RoleServiceImpl.java → common/src/main/java/com/jpsoft/machinery/modules/sys/service/impl/RoleServiceImpl.java

@@ -1,15 +1,15 @@
-package com.jpsoft.supervision.modules.sys.service.impl;
+package com.jpsoft.machinery.modules.sys.service.impl;
 
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.supervision.modules.sys.dao.RoleDAO;
-import com.jpsoft.supervision.modules.sys.entity.Role;
-import com.jpsoft.supervision.modules.sys.service.RoleService;
+import com.jpsoft.machinery.modules.sys.dao.RoleDAO;
+import com.jpsoft.machinery.modules.sys.entity.Role;
+import com.jpsoft.machinery.modules.sys.service.RoleService;
 import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

common/src/main/java/com/jpsoft/supervision/modules/sys/service/impl/SysLogServiceImpl.java → common/src/main/java/com/jpsoft/machinery/modules/sys/service/impl/SysLogServiceImpl.java

@@ -1,11 +1,11 @@
-package com.jpsoft.supervision.modules.sys.service.impl;
+package com.jpsoft.machinery.modules.sys.service.impl;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.jpsoft.supervision.modules.sys.dao.SysLogDAO;
-import com.jpsoft.supervision.modules.sys.entity.SysLog;
-import com.jpsoft.supervision.modules.sys.service.SysLogService;
+import com.jpsoft.machinery.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.sys.dao.SysLogDAO;
+import com.jpsoft.machinery.modules.sys.entity.SysLog;
+import com.jpsoft.machinery.modules.sys.service.SysLogService;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 

common/src/main/java/com/jpsoft/supervision/modules/sys/service/impl/UserRoleServiceImpl.java → common/src/main/java/com/jpsoft/machinery/modules/sys/service/impl/UserRoleServiceImpl.java

@@ -1,17 +1,17 @@
-package com.jpsoft.supervision.modules.sys.service.impl;
+package com.jpsoft.machinery.modules.sys.service.impl;
 
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
 
-import com.jpsoft.supervision.modules.sys.entity.Role;
+import com.jpsoft.machinery.modules.sys.entity.Role;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.supervision.modules.sys.dao.UserRoleDAO;
-import com.jpsoft.supervision.modules.sys.entity.UserRole;
-import com.jpsoft.supervision.modules.sys.service.UserRoleService;
+import com.jpsoft.machinery.modules.sys.dao.UserRoleDAO;
+import com.jpsoft.machinery.modules.sys.entity.UserRole;
+import com.jpsoft.machinery.modules.sys.service.UserRoleService;
 import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

common/src/main/java/com/jpsoft/supervision/modules/sys/service/impl/UserServiceImpl.java → common/src/main/java/com/jpsoft/machinery/modules/sys/service/impl/UserServiceImpl.java

@@ -1,15 +1,15 @@
-package com.jpsoft.supervision.modules.sys.service.impl;
+package com.jpsoft.machinery.modules.sys.service.impl;
 
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.supervision.modules.sys.dao.UserDAO;
-import com.jpsoft.supervision.modules.sys.entity.User;
-import com.jpsoft.supervision.modules.sys.service.UserService;
+import com.jpsoft.machinery.modules.sys.dao.UserDAO;
+import com.jpsoft.machinery.modules.sys.entity.User;
+import com.jpsoft.machinery.modules.sys.service.UserService;
 import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional

common/src/main/java/com/jpsoft/supervision/modules/wechat/entity/AccessToken.java → common/src/main/java/com/jpsoft/machinery/modules/wechat/entity/AccessToken.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.wechat.entity;
+package com.jpsoft.machinery.modules.wechat.entity;
 
 import lombok.Data;
 

common/src/main/java/com/jpsoft/supervision/modules/wechat/vo/UserInfo.java → common/src/main/java/com/jpsoft/machinery/modules/wechat/vo/UserInfo.java

@@ -1,4 +1,4 @@
-package com.jpsoft.supervision.modules.wechat.vo;
+package com.jpsoft.machinery.modules.wechat.vo;
 
 import lombok.Data;
 

common/src/main/java/com/jpsoft/supervision/modules/base/dao/IncidentAttachmentDAO.java

@@ -1,19 +0,0 @@
-package com.jpsoft.supervision.modules.base.dao;
-
-import java.util.List;
-import org.springframework.stereotype.Repository;
-import com.jpsoft.supervision.modules.base.entity.IncidentAttachment;
-import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-@Repository
-public interface IncidentAttachmentDAO {
-	int insert(IncidentAttachment entity);
-	int update(IncidentAttachment entity);
-	int exist(String id);
-	IncidentAttachment get(String id);
-	int delete(String id);
-	List<IncidentAttachment> list();
-	List<IncidentAttachment> search(Map<String,Object> searchParams,List<Sort> sortList);
-	List<IncidentAttachment> findListByIncidentId(String incidentId,String attachmentType);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dao/IncidentDAO.java

@@ -1,19 +0,0 @@
-package com.jpsoft.supervision.modules.base.dao;
-
-import java.util.List;
-import org.springframework.stereotype.Repository;
-import com.jpsoft.supervision.modules.base.entity.Incident;
-import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-@Repository
-public interface IncidentDAO {
-	int insert(Incident entity);
-	int update(Incident entity);
-	int exist(String id);
-	Incident get(String id);
-	int delete(String id);
-	List<Incident> list();
-	List<Incident> search(Map<String,Object> searchParams,List<Sort> sortList);
-	List<Incident> searchPanding(Map<String,Object> searchParams,List<Sort> sortList);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dao/IncidentStepDAO.java

@@ -1,19 +0,0 @@
-package com.jpsoft.supervision.modules.base.dao;
-
-import java.util.List;
-import org.springframework.stereotype.Repository;
-import com.jpsoft.supervision.modules.base.entity.IncidentStep;
-import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-@Repository
-public interface IncidentStepDAO {
-	int insert(IncidentStep entity);
-	int update(IncidentStep entity);
-	int exist(String id);
-	IncidentStep get(String id);
-	int delete(String id);
-	List<IncidentStep> list();
-	List<IncidentStep> search(Map<String,Object> searchParams,List<Sort> sortList);
-	List<IncidentStep> findListByIncidentId(String incidentId);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dao/OrganizationDAO.java

@@ -1,18 +0,0 @@
-package com.jpsoft.supervision.modules.base.dao;
-
-import java.util.List;
-import org.springframework.stereotype.Repository;
-import com.jpsoft.supervision.modules.base.entity.Organization;
-import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-@Repository
-public interface OrganizationDAO {
-	int insert(Organization entity);
-	int update(Organization entity);
-	int exist(String id);
-	Organization get(String id);
-	int delete(String id);
-	List<Organization> list();
-	List<Organization> search(Map<String,Object> searchParams,List<Sort> sortList);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dao/PersonDAO.java

@@ -1,18 +0,0 @@
-package com.jpsoft.supervision.modules.base.dao;
-
-import java.util.List;
-import org.springframework.stereotype.Repository;
-import com.jpsoft.supervision.modules.base.entity.Person;
-import java.util.Map;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-@Repository
-public interface PersonDAO {
-	int insert(Person entity);
-	int update(Person entity);
-	int exist(String id);
-	Person get(String id);
-	int delete(String id);
-	List<Person> list();
-	List<Person> search(Map<String,Object> searchParams,List<Sort> sortList);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/dto/IncidentAttachmentDTO.java

@@ -1,21 +0,0 @@
-package com.jpsoft.supervision.modules.base.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
-  描述:base_incident_attachment的实体类
- */
-@Data
-@ApiModel(value = "base_incident_attachment的实体类")
-public class IncidentAttachmentDTO {
-        @ApiModelProperty(value = "附件标题")
-    private String name;
-        @ApiModelProperty(value = "附件路径")
-    private String url;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/entity/Incident.java

@@ -1,96 +0,0 @@
-package com.jpsoft.supervision.modules.base.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import java.util.List;
-
-import com.jpsoft.supervision.modules.base.dto.IncidentAttachmentDTO;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:base_incident的实体类
- */
-@Data
-@ApiModel(value = "base_incident的实体类")
-public class Incident {
-        @ApiModelProperty(value = "菜单编号")
-    private String id;
-        @ApiModelProperty(value = "标题")
-    private String title;
-        @ApiModelProperty(value = "内容")
-    private String content;
-        @ApiModelProperty(value = "督办类型")
-    private String caseType;
-        @ApiModelProperty(value = "督办类型名称")
-    private String caseTypeName;
-        @ApiModelProperty(value = "领导批示")
-    private String instructions;
-        @ApiModelProperty(value = "领导批示类型")
-    private String instructionsType;
-    @ApiModelProperty(value = "领导批示名称")
-    private String instructionsName;
-        @DateTimeFormat(pattern="yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
-	    @ApiModelProperty(value = "领导批示时间")
-    private Date instructionsTime;
-        @ApiModelProperty(value = "事件状态")
-    private String isFinished;
-        @ApiModelProperty(value = "事件状态名称")
-    private String isFinishedName;
-        @ApiModelProperty(value = "是否删除")
-    private Boolean delFlag;
-        @DateTimeFormat(pattern="yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
-	    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-        @ApiModelProperty(value = "创建人")
-    private String createBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
-	    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-        @ApiModelProperty(value = "更新人")
-    private String updateBy;
-        @ApiModelProperty(value = "附件列表")
-    private List<IncidentAttachmentDTO> attList;
-        @ApiModelProperty(value = "图片列表")
-    private List<IncidentAttachmentDTO> picList;
-        @ApiModelProperty(value = "图片路径列表")
-    private String[] picUrlList;
-        @ApiModelProperty(value = "步进列表")
-    private List<IncidentStep> incidentStepList;
-        @ApiModelProperty(value = "步进条数")
-    private Integer incidentStepSize;
-    @ApiModelProperty(value = "菜单编号")
-    private String stepId;
-    @ApiModelProperty(value = "责任单位")
-    private String stepOrgId;
-    @ApiModelProperty(value = "责任单位名称")
-    private String stepOrgName;
-    @ApiModelProperty(value = "责任人")
-    private String stepPersonId;
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone ="GMT+8")
-    @ApiModelProperty(value = "提醒时间")
-    private Date stepWarnTime;
-    @ApiModelProperty(value = "处置内容")
-    private String stepContent;
-    @ApiModelProperty(value = "提交处置方式")
-    private String subWayType;
-    @ApiModelProperty(value = "处置内容")
-    private String subContent;
-    @ApiModelProperty(value = "责任单位")
-    private String subOrgId;
-    @ApiModelProperty(value = "责任单位")
-    private String subPersonId;
-    @ApiModelProperty(value = "提醒时间")
-    private Date subWarnTime;
-    @ApiModelProperty(value = "报警灯")
-    private String warningLight;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/entity/IncidentAttachment.java

@@ -1,37 +0,0 @@
-package com.jpsoft.supervision.modules.base.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:base_incident_attachment的实体类
- */
-@Data
-@ApiModel(value = "base_incident_attachment的实体类")
-public class IncidentAttachment {
-        @ApiModelProperty(value = "编号")
-    private String id;
-        @ApiModelProperty(value = "督查事件编号")
-    private String incidentId;
-        @ApiModelProperty(value = "附件类型")
-    private String attachmentType;
-        @ApiModelProperty(value = "附件标题")
-    private String attachmentTitle;
-        @ApiModelProperty(value = "附件路径")
-    private String attachmentUrl;
-        @ApiModelProperty(value = "序号")
-    private Integer sortNo;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-        @ApiModelProperty(value = "创建人")
-    private String createBy;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/entity/IncidentStep.java

@@ -1,49 +0,0 @@
-package com.jpsoft.supervision.modules.base.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:base_incident_step的实体类
- */
-@Data
-@ApiModel(value = "base_incident_step的实体类")
-public class IncidentStep {
-        @ApiModelProperty(value = "菜单编号")
-    private String id;
-        @ApiModelProperty(value = "督查事件编号")
-    private String incidentId;
-        @ApiModelProperty(value = "责任单位")
-    private String orgId;
-        @ApiModelProperty(value = "责任单位名称")
-    private String orgName;
-        @ApiModelProperty(value = "责任人")
-    private String personId;
-        @ApiModelProperty(value = "责任人姓名")
-    private String personName;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "提醒时间")
-    private Date warnTime;
-        @ApiModelProperty(value = "处置内容")
-    private String content;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-        @ApiModelProperty(value = "创建人")
-    private String createBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-        @ApiModelProperty(value = "更新人")
-    private String updateBy;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/entity/Organization.java

@@ -1,43 +0,0 @@
-package com.jpsoft.supervision.modules.base.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:base_organization的实体类
- */
-@Data
-@ApiModel(value = "base_organization的实体类")
-public class Organization {
-        @ApiModelProperty(value = "菜单编号")
-    private String id;
-        @ApiModelProperty(value = "机构名称")
-    private String name;
-        @ApiModelProperty(value = "上级机构")
-    private String parentId;
-        @ApiModelProperty(value = "上级机构")
-    private String parentName;
-        @ApiModelProperty(value = "机构代码")
-    private String code;
-        @ApiModelProperty(value = "")
-    private Boolean delFlag;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "")
-    private Date createTime;
-        @ApiModelProperty(value = "")
-    private String createBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "")
-    private Date updateTime;
-        @ApiModelProperty(value = "")
-    private String updateBy;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/entity/Person.java

@@ -1,43 +0,0 @@
-package com.jpsoft.supervision.modules.base.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.math.BigDecimal;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
-  描述:base_person的实体类
- */
-@Data
-@ApiModel(value = "base_person的实体类")
-public class Person {
-        @ApiModelProperty(value = "编号")
-    private String id;
-        @ApiModelProperty(value = "机构编号")
-    private String orgId;
-        @ApiModelProperty(value = "机构名称")
-    private String orgName;
-        @ApiModelProperty(value = "姓名")
-    private String name;
-        @ApiModelProperty(value = "电话")
-    private String phone;
-        @ApiModelProperty(value = "是否删除")
-    private Boolean delFlag;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-        @ApiModelProperty(value = "创建人")
-    private String createBy;
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
-	    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-        @ApiModelProperty(value = "更新人")
-    private String updateBy;
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/IncidentAttachmentService.java

@@ -1,18 +0,0 @@
-package com.jpsoft.supervision.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.jpsoft.supervision.modules.base.entity.IncidentAttachment;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-public interface IncidentAttachmentService {
-	IncidentAttachment get(String id);
-	boolean exist(String id);
-	int insert(IncidentAttachment model);
-	int update(IncidentAttachment model);
-	int delete(String id);
-	List<IncidentAttachment> list();
-	Page<IncidentAttachment> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
-	List<IncidentAttachment> findListByIncidentId(String incidentId,String attachmentType);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/IncidentService.java

@@ -1,18 +0,0 @@
-package com.jpsoft.supervision.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.jpsoft.supervision.modules.base.entity.Incident;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-public interface IncidentService {
-	Incident get(String id);
-	boolean exist(String id);
-	int insert(Incident model);
-	int update(Incident model);
-	int delete(String id);
-	List<Incident> list();
-	Page<Incident> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
-	Page<Incident> pageSearchPanding(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/IncidentStepService.java

@@ -1,18 +0,0 @@
-package com.jpsoft.supervision.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.jpsoft.supervision.modules.base.entity.IncidentStep;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-public interface IncidentStepService {
-	IncidentStep get(String id);
-	boolean exist(String id);
-	int insert(IncidentStep model);
-	int update(IncidentStep model);
-	int delete(String id);
-	List<IncidentStep> list();
-	Page<IncidentStep> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
-	List<IncidentStep> findListByIncidentId(String incidentId);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/OrganizationService.java

@@ -1,17 +0,0 @@
-package com.jpsoft.supervision.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.jpsoft.supervision.modules.base.entity.Organization;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-public interface OrganizationService {
-	Organization get(String id);
-	boolean exist(String id);
-	int insert(Organization model);
-	int update(Organization model);
-	int delete(String id);
-	List<Organization> list();
-	Page<Organization> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/PersonService.java

@@ -1,17 +0,0 @@
-package com.jpsoft.supervision.modules.base.service;
-
-import java.util.List;
-import java.util.Map;
-import com.jpsoft.supervision.modules.base.entity.Person;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-
-public interface PersonService {
-	Person get(String id);
-	boolean exist(String id);
-	int insert(Person model);
-	int update(Person model);
-	int delete(String id);
-	List<Person> list();
-	Page<Person> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/IncidentAttachmentServiceImpl.java

@@ -1,76 +0,0 @@
-package com.jpsoft.supervision.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.supervision.modules.base.dao.IncidentAttachmentDAO;
-import com.jpsoft.supervision.modules.base.entity.IncidentAttachment;
-import com.jpsoft.supervision.modules.base.service.IncidentAttachmentService;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="incidentAttachmentService")
-public class IncidentAttachmentServiceImpl implements IncidentAttachmentService {
-	@Resource(name="incidentAttachmentDAO")
-	private IncidentAttachmentDAO incidentAttachmentDAO;
-
-	@Override
-	public IncidentAttachment get(String id) {
-		// TODO Auto-generated method stub
-		return incidentAttachmentDAO.get(id);
-	}
-
-	@Override
-	public int insert(IncidentAttachment model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return incidentAttachmentDAO.insert(model);
-	}
-
-	@Override
-	public int update(IncidentAttachment model) {
-		// TODO Auto-generated method stub
-		return incidentAttachmentDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return incidentAttachmentDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = incidentAttachmentDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<IncidentAttachment> list() {
-		// TODO Auto-generated method stub
-		return incidentAttachmentDAO.list();
-	}
-
-	@Override
-	public List<IncidentAttachment> findListByIncidentId(String incidentId,String attachmentType) {
-		// TODO Auto-generated method stub
-		return incidentAttachmentDAO.findListByIncidentId(incidentId,attachmentType);
-	}
-		
-	@Override
-	public Page<IncidentAttachment> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<IncidentAttachment> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            incidentAttachmentDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/IncidentServiceImpl.java

@@ -1,79 +0,0 @@
-package com.jpsoft.supervision.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.supervision.modules.base.dao.IncidentDAO;
-import com.jpsoft.supervision.modules.base.entity.Incident;
-import com.jpsoft.supervision.modules.base.service.IncidentService;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="incidentService")
-public class IncidentServiceImpl implements IncidentService {
-	@Resource(name="incidentDAO")
-	private IncidentDAO incidentDAO;
-
-	@Override
-	public Incident get(String id) {
-		// TODO Auto-generated method stub
-		return incidentDAO.get(id);
-	}
-
-	@Override
-	public int insert(Incident model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return incidentDAO.insert(model);
-	}
-
-	@Override
-	public int update(Incident model) {
-		// TODO Auto-generated method stub
-		return incidentDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return incidentDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = incidentDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<Incident> list() {
-		// TODO Auto-generated method stub
-		return incidentDAO.list();
-	}
-		
-	@Override
-	public Page<Incident> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<Incident> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            incidentDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-
-	@Override
-	public Page<Incident> pageSearchPanding(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-		Page<Incident> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-			incidentDAO.searchPanding(searchParams,sortList);
-		});
-
-		return page;
-	}
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/IncidentStepServiceImpl.java

@@ -1,76 +0,0 @@
-package com.jpsoft.supervision.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.supervision.modules.base.dao.IncidentStepDAO;
-import com.jpsoft.supervision.modules.base.entity.IncidentStep;
-import com.jpsoft.supervision.modules.base.service.IncidentStepService;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="incidentStepService")
-public class IncidentStepServiceImpl implements IncidentStepService {
-	@Resource(name="incidentStepDAO")
-	private IncidentStepDAO incidentStepDAO;
-
-	@Override
-	public IncidentStep get(String id) {
-		// TODO Auto-generated method stub
-		return incidentStepDAO.get(id);
-	}
-
-	@Override
-	public int insert(IncidentStep model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return incidentStepDAO.insert(model);
-	}
-
-	@Override
-	public int update(IncidentStep model) {
-		// TODO Auto-generated method stub
-		return incidentStepDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return incidentStepDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = incidentStepDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<IncidentStep> list() {
-		// TODO Auto-generated method stub
-		return incidentStepDAO.list();
-	}
-		
-	@Override
-	public Page<IncidentStep> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<IncidentStep> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            incidentStepDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-
-	@Override
-	public List<IncidentStep> findListByIncidentId(String incidentId){
-		// TODO Auto-generated method stub
-		return incidentStepDAO.findListByIncidentId(incidentId);
-	}
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/OrganizationServiceImpl.java

@@ -1,70 +0,0 @@
-package com.jpsoft.supervision.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.supervision.modules.base.dao.OrganizationDAO;
-import com.jpsoft.supervision.modules.base.entity.Organization;
-import com.jpsoft.supervision.modules.base.service.OrganizationService;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="organizationService")
-public class OrganizationServiceImpl implements OrganizationService {
-	@Resource(name="organizationDAO")
-	private OrganizationDAO organizationDAO;
-
-	@Override
-	public Organization get(String id) {
-		// TODO Auto-generated method stub
-		return organizationDAO.get(id);
-	}
-
-	@Override
-	public int insert(Organization model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return organizationDAO.insert(model);
-	}
-
-	@Override
-	public int update(Organization model) {
-		// TODO Auto-generated method stub
-		return organizationDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return organizationDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = organizationDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<Organization> list() {
-		// TODO Auto-generated method stub
-		return organizationDAO.list();
-	}
-		
-	@Override
-	public Page<Organization> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<Organization> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            organizationDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-}

common/src/main/java/com/jpsoft/supervision/modules/base/service/impl/PersonServiceImpl.java

@@ -1,70 +0,0 @@
-package com.jpsoft.supervision.modules.base.service.impl;
-
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import javax.annotation.Resource;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.supervision.modules.base.dao.PersonDAO;
-import com.jpsoft.supervision.modules.base.entity.Person;
-import com.jpsoft.supervision.modules.base.service.PersonService;
-import com.github.pagehelper.Page;
-import com.jpsoft.supervision.modules.common.dto.Sort;
-import com.github.pagehelper.PageHelper;
-
-@Transactional
-@Component(value="personService")
-public class PersonServiceImpl implements PersonService {
-	@Resource(name="personDAO")
-	private PersonDAO personDAO;
-
-	@Override
-	public Person get(String id) {
-		// TODO Auto-generated method stub
-		return personDAO.get(id);
-	}
-
-	@Override
-	public int insert(Person model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return personDAO.insert(model);
-	}
-
-	@Override
-	public int update(Person model) {
-		// TODO Auto-generated method stub
-		return personDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return personDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = personDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<Person> list() {
-		// TODO Auto-generated method stub
-		return personDAO.list();
-	}
-		
-	@Override
-	public Page<Person> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<Person> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            personDAO.search(searchParams,sortList);
-        });
-        
-        return page;
-	}
-}

common/src/main/resources/mapper/base/Incident.xml

@@ -1,141 +0,0 @@
-<?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">
-<!-- namespace必须指向DAO接口 -->
-<mapper namespace="com.jpsoft.supervision.modules.base.dao.IncidentDAO">
-	<resultMap id="IncidentMap" type="com.jpsoft.supervision.modules.base.entity.Incident">
-		<id property="id" column="id_" />
-			<result property="title" column="title_" />
-			<result property="content" column="content_" />
-			<result property="caseType" column="case_type" />
-			<result property="instructions" column="instructions" />
-			<result property="instructionsType" column="instructions_type" />
-			<result property="instructionsTime" column="instructions_time" />
-			<result property="isFinished" column="is_finished" />
-			<result property="delFlag" column="del_flag" />
-			<result property="createTime" column="create_time" />
-			<result property="createBy" column="create_by" />
-			<result property="updateTime" column="update_time" />
-			<result property="updateBy" column="update_by" />
-			</resultMap>
-	<insert id="insert" parameterType="com.jpsoft.supervision.modules.base.entity.Incident">
-	<!--
-	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
-		select sys_guid() from dual
-	</selectKey>
-	-->
-	<![CDATA[
-		insert into base_incident
-	    (id_,title_,content_,case_type,instructions,instructions_type,instructions_time,is_finished,del_flag,create_time,create_by,update_time,update_by)
-		values
-		(
-#{id,jdbcType=VARCHAR}
-,#{title,jdbcType=VARCHAR}
-,#{content,jdbcType=VARCHAR}
-,#{caseType,jdbcType=VARCHAR}
-,#{instructions,jdbcType=VARCHAR}
-,#{instructionsType,jdbcType=VARCHAR}
-,#{instructionsTime,jdbcType= TIMESTAMP }
-,#{isFinished,jdbcType= NUMERIC }
-,#{delFlag,jdbcType= NUMERIC }
-,#{createTime,jdbcType= TIMESTAMP }
-,#{createBy,jdbcType=VARCHAR}
-,#{updateTime,jdbcType= TIMESTAMP }
-,#{updateBy,jdbcType=VARCHAR}
-		)
-	]]>
-	</insert>
-	<delete id="delete" parameterType="string">
-		delete from base_incident where id_=#{id,jdbcType=VARCHAR}
-	</delete>
-	<update id="update" parameterType="com.jpsoft.supervision.modules.base.entity.Incident">
-		update base_incident
-		<set>
-				<if test="title!=null">
-		title_=#{title,jdbcType=VARCHAR},
-		</if>
-				<if test="content!=null">
-		content_=#{content,jdbcType=VARCHAR},
-		</if>
-				<if test="caseType!=null">
-		case_type=#{caseType,jdbcType=VARCHAR},
-		</if>
-				<if test="instructions!=null">
-		instructions=#{instructions,jdbcType=VARCHAR},
-		</if>
-				<if test="instructionsType!=null">
-			instructions_type=#{instructionsType,jdbcType=VARCHAR},
-		</if>
-				<if test="instructionsTime!=null">
-		instructions_time=#{instructionsTime,jdbcType= TIMESTAMP },
-		</if>
-			<if test="isFinished!=null">
-				is_finished=#{isFinished,jdbcType= NUMERIC },
-			</if>
-				<if test="delFlag!=null">
-		del_flag=#{delFlag,jdbcType= NUMERIC },
-		</if>
-				<if test="createTime!=null">
-		create_time=#{createTime,jdbcType= TIMESTAMP },
-		</if>
-				<if test="createBy!=null">
-		create_by=#{createBy,jdbcType=VARCHAR},
-		</if>
-				<if test="updateTime!=null">
-		update_time=#{updateTime,jdbcType= TIMESTAMP },
-		</if>
-				<if test="updateBy!=null">
-		update_by=#{updateBy,jdbcType=VARCHAR},
-		</if>
-		</set>
-	where id_=#{id}
-	</update>
-	<select id="get" parameterType="string" resultMap="IncidentMap">
-		select 
-id_,title_,content_,case_type,instructions,instructions_type,instructions_time,is_finished,del_flag,create_time,create_by,update_time,update_by		from base_incident where id_=#{0}
-	</select>
-	<select id="exist" parameterType="string" resultType="int">
-		select count(*) from base_incident where id_=#{0}
-	</select>
-	<select id="list" resultMap="IncidentMap">
-		select * from base_incident
-	</select>
-	<select id="search" parameterType="hashmap" resultMap="IncidentMap">
-		<![CDATA[
-			select * from base_incident
-		]]>
-		<where>
-			and del_flag=0
-			<if test="searchParams.title != null">
-				and title_ like #{searchParams.title}
-			</if>
-			<if test="searchParams.caseType != null">
-				and case_type = #{searchParams.caseType}
-			</if>
-			<if test="searchParams.isFinished != null">
-				and is_finished = #{searchParams.isFinished}
-			</if>
-		</where>
-		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-	        ${sort.name} ${sort.order}
-	 	</foreach>
-	</select>
-	<select id="searchPanding" parameterType="hashmap" resultMap="IncidentMap">
-		<![CDATA[
-			SELECT b.* FROM base_incident_step a
-			LEFT JOIN base_incident b ON a.incident_id = b.id_
-		]]>
-		<where>
-			and a.update_time IS NULL AND b.del_flag=0
-			<if test="searchParams.title != null">
-				and b.title_ like #{searchParams.title}
-			</if>
-			<if test="searchParams.caseType != null">
-				and b.case_type = #{searchParams.caseType}
-			</if>
-		</where>
-		<foreach item="sort" collection="sortList"  open="order by" separator=",">
-			${sort.name} ${sort.order}
-		</foreach>
-	</select>
-</mapper>