Merge branch 'master' of http://111.61.77.35:9999/wanghao/zh-baseversion-project

zh-baseversion-admin/src/main/java/com/zehong/web/controller/api/APIController.java

@@ -43,7 +43,7 @@ public class APIController {
         RsaToClient rsa = new RsaToClient(privateKeyString, publicKeyString);
 
         TSiteStationInfo tSiteStationInfo=new TSiteStationInfo();
-        tSiteStationInfo.setBeyondEnterpriseId(Long.valueOf(15));
+        tSiteStationInfo.setBeyondEnterpriseId("15");
         List<TSiteStationInfo> tSiteStationInfos = tSiteStationInfoService.selectTSiteStationInfoList(tSiteStationInfo);
         //        组装加密数据结构 （这里根据接口参数进行调整组装格式）
 

zh-baseversion-admin/src/main/java/com/zehong/web/controller/complainDeal/TComplainDealController.java

@@ -49,7 +49,7 @@ public class TComplainDealController extends BaseController
     public TableDataInfo list(TComplainDeal tComplainDeal, HttpServletRequest request)
     {
         LoginUser loginUser = tokenService.getLoginUser(request);
-        if(loginUser.getUser().getDeptId()!=-2){
+        if(!"-2".equals(loginUser.getUser().getDeptId())){
             tComplainDeal.setComplainAssignEnterproseId(loginUser.getUser().getDeptId());
         }
         startPage();

zh-baseversion-admin/src/main/java/com/zehong/web/controller/operationMonitor/TWorkOrderController.java

@@ -102,7 +102,7 @@ public class TWorkOrderController extends BaseController
     private void judgeUserRole(TWorkOrder tWorkOrder){
         SysUser user = SecurityUtils.getLoginUser().getUser();
         //获取用户所属单位
-        long enterpriseId = user.getDeptId();
+        String enterpriseId = user.getDeptId();
         //判断是否为政府用户
         if(!"-2".equals(String.valueOf(enterpriseId))){
             tWorkOrder.setWorkAssignEnterproseId(enterpriseId);
@@ -187,7 +187,7 @@ public class TWorkOrderController extends BaseController
         //获取当前登录用户信息
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         SysUser user = loginUser.getUser();
-        if (user.getDeptId()==-2){
+        if ("-2".equals(user.getDeptId())){
 //            user.setDeptId((long) 0);
         }else {
             enterpriseId= String.valueOf(user.getDeptId());

zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervise/PipeInterfaceController.java

@@ -38,8 +38,8 @@ public class PipeInterfaceController extends BaseController {
         SysUser user = loginUser.getUser();
         //获取分组数据
         List<PipeDate> pipeDatesGroup = iPipeInterfaceService.selectGroupPipeData();
-        if (user.getDeptId()==-2){
-            user.setDeptId((long) 0);
+        if ("-2".equals(user.getDeptId())){
+            user.setDeptId("0");
         }
         //查询管道数据列表
         List<PipeDate> pipeDates = iPipeInterfaceService.selectPipeData(String.valueOf(user.getDeptId()));
@@ -77,11 +77,11 @@ public class PipeInterfaceController extends BaseController {
 
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         SysUser user = loginUser.getUser();
-        if (user.getDeptId()==-2){
-            user.setDeptId((long) 0);
+        if ("-2".equals(user.getDeptId())){
+            user.setDeptId("0");
         }
         //调压箱数据查询方法
-        List<DeviceData> deviceData = iPipeInterfaceService.selectDeviceData(String.valueOf(user.getDeptId()));
+        List<DeviceData> deviceData = iPipeInterfaceService.selectDeviceData(user.getDeptId());
 //        //查询下级全部数据方法
 //        List<PressureFlow> pressureFlows1 = iPipeInterfaceService.selectPressureFlows("1");
 //        for (int i=0;i<deviceData.size();i++){
@@ -221,11 +221,11 @@ public class PipeInterfaceController extends BaseController {
 
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         SysUser user = loginUser.getUser();
-        if (user.getDeptId()==-2){
-            user.setDeptId((long) 0);
+        if ("-2".equals(user.getDeptId())){
+            user.setDeptId("0");
         }
         //调压箱数据查询方法
-        List<DeviceData> deviceData = iPipeInterfaceService.selectDeviceData(String.valueOf(user.getDeptId()));
+        List<DeviceData> deviceData = iPipeInterfaceService.selectDeviceData(user.getDeptId());
         //查询下级全部数据方法
         List<PressureFlow> pressureFlows1 = iPipeInterfaceService.selectPressureFlow("1");
         //最后返回的封装类型
@@ -337,11 +337,11 @@ public class PipeInterfaceController extends BaseController {
         TSiteStationInfoDataList tSiteStationInfoDataList=new TSiteStationInfoDataList();
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         SysUser user = loginUser.getUser();
-        if (user.getDeptId()==-2){
-            user.setDeptId((long) 0);
+        if ("-2".equals(user.getDeptId())){
+            user.setDeptId("0");
         }
         //场站信息查询方法
-        List<TSiteStationInfoData> tSiteStationInfoData = iPipeInterfaceService.selectTSiteStationInfoData(String.valueOf(user.getDeptId()));
+        List<TSiteStationInfoData> tSiteStationInfoData = iPipeInterfaceService.selectTSiteStationInfoData(user.getDeptId());
         List<TSiteStationInfoData> list=new ArrayList<>();
 //        //查询下级全部数据方法
 //        List<PressureFlow> pressureFlows1 = iPipeInterfaceService.selectPressureFlows("2");
@@ -481,11 +481,11 @@ public class PipeInterfaceController extends BaseController {
     public TSiteStationInfoDataList selectTSiteStationInfoDatas(){
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         SysUser user = loginUser.getUser();
-        if (user.getDeptId()==-2){
-            user.setDeptId((long) 0);
+        if ("-2".equals(user.getDeptId())){
+            user.setDeptId("0");
         }
         //场站信息查询方法
-        List<TSiteStationInfoData> tSiteStationInfoData = iPipeInterfaceService.selectTSiteStationInfoData(String.valueOf(user.getDeptId()));
+        List<TSiteStationInfoData> tSiteStationInfoData = iPipeInterfaceService.selectTSiteStationInfoData(user.getDeptId());
         //查询场站下级设备数据
         List<PressureFlow> pressureFlows = iPipeInterfaceService.selecttSiteStationInfoDataList("1");
         TSiteStationInfoDataList tSiteStationInfoDataList=new TSiteStationInfoDataList();
@@ -584,11 +584,11 @@ public class PipeInterfaceController extends BaseController {
 
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         SysUser user = loginUser.getUser();
-        if (user.getDeptId()==-2){
-            user.setDeptId((long) 0);
+        if ("-2".equals(user.getDeptId())){
+            user.setDeptId("0");
         }
         //查询阀门井数据
-        List<DeviceData> pipeDates = iPipeInterfaceService.selectvalveData(String.valueOf(user.getDeptId()));
+        List<DeviceData> pipeDates = iPipeInterfaceService.selectvalveData(user.getDeptId());
 //        //查询下级全部数据方法
 //        List<PressureFlow> pressureFlows1 = iPipeInterfaceService.selectPressureFlows("1");
 //        for (int i=0;i<pipeDates.size();i++){
@@ -622,8 +622,8 @@ public class PipeInterfaceController extends BaseController {
     public DeviceDataList selectvalveDatas(){
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         SysUser user = loginUser.getUser();
-        if (user.getDeptId()==-2){
-            user.setDeptId((long) 0);
+        if ("-2".equals(user.getDeptId())){
+            user.setDeptId("0");
         }
         //查询阀门井数据
         List<DeviceData> pipeDates = iPipeInterfaceService.selectvalveData(String.valueOf(user.getDeptId()));

zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervise/TDeviceInfoController.java

@@ -258,7 +258,7 @@ public class TDeviceInfoController extends BaseController
         //获取当前登录用户信息
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         SysUser user = loginUser.getUser();
-        if (user.getDeptId()==-2){
+        if ("-2".equals(user.getDeptId())){
 //            user.setDeptId((long) 0);
         }else {
             enterpriseId= String.valueOf(user.getDeptId());

zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervise/TEnterpriseInfoController.java

@@ -9,6 +9,7 @@ import com.zehong.common.core.page.TableDataInfo;
 import com.zehong.common.enums.BusinessType;
 import com.zehong.common.utils.SecurityUtils;
 import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.utils.uuid.UUID;
 import com.zehong.framework.config.ServerConfig;
 import com.zehong.system.domain.TEnterpriseInfo;
 import com.zehong.system.domain.vo.TEnterpriseInfoVO;
@@ -107,7 +108,7 @@ public class TEnterpriseInfoController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('regulation:info:query')")
     @GetMapping(value = "/{enterpriseId}")
-    public AjaxResult getInfo(@PathVariable("enterpriseId") Long enterpriseId)
+    public AjaxResult getInfo(@PathVariable("enterpriseId") String enterpriseId)
     {
         return AjaxResult.success(tEnterpriseInfoService.selectTEnterpriseInfoById(enterpriseId));
     }
@@ -157,7 +158,7 @@ public class TEnterpriseInfoController extends BaseController
     @PreAuthorize("@ss.hasPermi('regulation:info:remove')")
     @Log(title = "企业信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{enterpriseIds}")
-    public AjaxResult remove(@PathVariable Long[] enterpriseIds)
+    public AjaxResult remove(@PathVariable String[] enterpriseIds)
     {
         return toAjax(tEnterpriseInfoService.deleteTEnterpriseInfoByIds(enterpriseIds));
     }

zh-baseversion-admin/src/main/java/com/zehong/web/controller/supervise/TProjectInfoController.java

@@ -95,7 +95,7 @@ public class TProjectInfoController extends BaseController
             //重复年份删除方法
             tProjectInfoService.deleteisSameYear(tProjectInfo.getProjectYear(),tProjectInfo.getBeyondEnterpriseId());
         }
-        if (user.getDeptId()!=-2){
+        if (!"-2".equals(user.getDeptId())){
             //查询企业名称
             String enterpriseName = tProjectInfoService.selectEnterpriseName(user.getDeptId());
             tProjectInfo.setEnterpriseCode(String.valueOf(enterpriseName));

zh-baseversion-common/src/main/java/com/zehong/common/core/domain/entity/SysUser.java

@@ -30,7 +30,7 @@ public class SysUser extends BaseEntity
 
     /** 部门ID */
     @Excel(name = "部门编号", type = Type.IMPORT)
-    private Long deptId;
+    private String deptId;
 
     /** 用户账号 */
     @Excel(name = "登录名称")
@@ -136,12 +136,12 @@ public class SysUser extends BaseEntity
         return userId != null && 1L == userId;
     }
 
-    public Long getDeptId()
+    public String getDeptId()
     {
         return deptId;
     }
 
-    public void setDeptId(Long deptId)
+    public void setDeptId(String deptId)
     {
         this.deptId = deptId;
     }

zh-baseversion-system/src/main/java/com/zehong/system/domain/TComplainDeal.java

@@ -50,7 +50,7 @@ public class TComplainDeal extends BaseEntity
 
     /** 指派单位id */
     @Excel(name = "指派单位id")
-    private Long complainAssignEnterproseId;
+    private String complainAssignEnterproseId;
 
     /** 指派人 */
     @Excel(name = "指派人id")
@@ -135,12 +135,12 @@ public class TComplainDeal extends BaseEntity
     {
         return complainAssignEnterproseName;
     }
-    public void setComplainAssignEnterproseId(Long complainAssignEnterproseId) 
+    public void setComplainAssignEnterproseId(String complainAssignEnterproseId)
     {
         this.complainAssignEnterproseId = complainAssignEnterproseId;
     }
 
-    public Long getComplainAssignEnterproseId() 
+    public String getComplainAssignEnterproseId()
     {
         return complainAssignEnterproseId;
     }

zh-baseversion-system/src/main/java/com/zehong/system/domain/TDetectorUser.java

@@ -31,7 +31,7 @@ public class TDetectorUser extends BaseEntity
     private String nickName;
 
     /** 权属单位 */
-    private Long beyondEnterpriseId;
+    private String beyondEnterpriseId;
 
     /** 用户类型（1居民用户，2商业用户，3工业用户） */
     @Excel(name = "用户类型")
@@ -114,11 +114,11 @@ public class TDetectorUser extends BaseEntity
         return serialVersionUID;
     }
 
-    public Long getBeyondEnterpriseId() {
+    public String getBeyondEnterpriseId() {
         return beyondEnterpriseId;
     }
 
-    public void setBeyondEnterpriseId(Long beyondEnterpriseId) {
+    public void setBeyondEnterpriseId(String beyondEnterpriseId) {
         this.beyondEnterpriseId = beyondEnterpriseId;
     }
 

zh-baseversion-system/src/main/java/com/zehong/system/domain/TDeviceInfo.java

@@ -45,7 +45,7 @@ public class TDeviceInfo extends BaseEntity
     private String deviceType;
 
     /** 权属单位 */
-    private Long beyondEnterpriseId;
+    private String beyondEnterpriseId;
 
     /** 权属单位名称 */
     @Excel(name = "权属单位名称")
@@ -158,12 +158,12 @@ public class TDeviceInfo extends BaseEntity
     {
         return deviceType;
     }
-    public void setBeyondEnterpriseId(Long beyondEnterpriseId)
+    public void setBeyondEnterpriseId(String beyondEnterpriseId)
     {
         this.beyondEnterpriseId = beyondEnterpriseId;
     }
 
-    public Long getBeyondEnterpriseId()
+    public String getBeyondEnterpriseId()
     {
         return beyondEnterpriseId;
     }

zh-baseversion-system/src/main/java/com/zehong/system/domain/TEmployedPeopleInfo.java

@@ -39,7 +39,7 @@ public class TEmployedPeopleInfo extends BaseEntity
     private String beyondEnterpriseName;
 
     /** 受聘企业id */
-    private Long beyondEnterpriseId;
+    private String beyondEnterpriseId;
 
     /** 发证部门 */
     @Excel(name = "发证部门")
@@ -121,12 +121,12 @@ public class TEmployedPeopleInfo extends BaseEntity
     {
         return beyondEnterpriseName;
     }
-    public void setBeyondEnterpriseId(Long beyondEnterpriseId)
+    public void setBeyondEnterpriseId(String beyondEnterpriseId)
     {
         this.beyondEnterpriseId = beyondEnterpriseId;
     }
 
-    public Long getBeyondEnterpriseId()
+    public String getBeyondEnterpriseId()
     {
         return beyondEnterpriseId;
     }

zh-baseversion-system/src/main/java/com/zehong/system/domain/TEnterpriseInfo.java

@@ -18,10 +18,10 @@ public class TEnterpriseInfo extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 企业id */
-    private Long enterpriseId;
+    private String enterpriseId;
 
     /**创建企业id*/
-    private Long createEnterpriseId;
+    private String createEnterpriseId;
 
     /** 企业名称 */
     @Excel(name = "企业名称")
@@ -84,11 +84,11 @@ public class TEnterpriseInfo extends BaseEntity
         this.enterpriseType = enterpriseType;
     }
 
-    public Long getCreateEnterpriseId() {
+    public String getCreateEnterpriseId() {
         return createEnterpriseId;
     }
 
-    public void setCreateEnterpriseId(Long createEnterpriseId) {
+    public void setCreateEnterpriseId(String createEnterpriseId) {
         this.createEnterpriseId = createEnterpriseId;
     }
 
@@ -112,12 +112,12 @@ public class TEnterpriseInfo extends BaseEntity
         this.doDusiness = doDusiness;
     }
 
-    public void setEnterpriseId(Long enterpriseId)
+    public void setEnterpriseId(String enterpriseId)
     {
         this.enterpriseId = enterpriseId;
     }
 
-    public Long getEnterpriseId()
+    public String getEnterpriseId()
     {
         return enterpriseId;
     }

zh-baseversion-system/src/main/java/com/zehong/system/domain/THiddenDangerStandingBook.java

@@ -73,7 +73,7 @@ public class THiddenDangerStandingBook extends BaseEntity
 
 
     /** 权属单位 */
-    private Long beyondEnterpriseId;
+    private String beyondEnterpriseId;
 
     private String source;
 
@@ -111,11 +111,11 @@ public class THiddenDangerStandingBook extends BaseEntity
         return serialVersionUID;
     }
 
-    public Long getBeyondEnterpriseId() {
+    public String getBeyondEnterpriseId() {
         return beyondEnterpriseId;
     }
 
-    public void setBeyondEnterpriseId(Long beyondEnterpriseId) {
+    public void setBeyondEnterpriseId(String beyondEnterpriseId) {
         this.beyondEnterpriseId = beyondEnterpriseId;
     }
 

zh-baseversion-system/src/main/java/com/zehong/system/domain/THiddenTroubleInfo.java

@@ -22,7 +22,7 @@ public class THiddenTroubleInfo extends BaseEntity
     private Long hiddenTroubleId;
 
     /** 权属单位 */
-    private Long beyondEnterpriseId;
+    private String beyondEnterpriseId;
 
     /** 巡检任务id */
     private Long workId;
@@ -218,11 +218,11 @@ public class THiddenTroubleInfo extends BaseEntity
         return serialVersionUID;
     }
 
-    public Long getBeyondEnterpriseId() {
+    public String getBeyondEnterpriseId() {
         return beyondEnterpriseId;
     }
 
-    public void setBeyondEnterpriseId(Long beyondEnterpriseId) {
+    public void setBeyondEnterpriseId(String beyondEnterpriseId) {
         this.beyondEnterpriseId = beyondEnterpriseId;
     }
 

zh-baseversion-system/src/main/java/com/zehong/system/domain/TLinePatrolPerson.java

@@ -36,7 +36,7 @@ public class TLinePatrolPerson extends BaseEntity
 
     /** $column.columnComment */
     @Excel(name = "组号")
-    private Long beyondEnterpriseId;
+    private String beyondEnterpriseId;
 
     /** 账号 */
     @Excel(name = "账号")
@@ -109,12 +109,12 @@ public class TLinePatrolPerson extends BaseEntity
     {
         return groupNum;
     }
-    public void setBeyondEnterpriseId(Long beyondEnterpriseId)
+    public void setBeyondEnterpriseId(String beyondEnterpriseId)
     {
         this.beyondEnterpriseId = beyondEnterpriseId;
     }
 
-    public Long getBeyondEnterpriseId()
+    public String getBeyondEnterpriseId()
     {
         return beyondEnterpriseId;
     }

zh-baseversion-system/src/main/java/com/zehong/system/domain/TPipeInfo.java

@@ -58,7 +58,7 @@ public class TPipeInfo extends BaseEntity
     private String peopleOccupation;
 
     /** 权属单位 */
-    private Long beyondEnterpriseId;
+    private String beyondEnterpriseId;
 
     /** 权属单位名称 */
     @Excel(name = "权属单位名称")
@@ -172,12 +172,12 @@ public class TPipeInfo extends BaseEntity
     {
         return buildUnit;
     }
-    public void setBeyondEnterpriseId(Long beyondEnterpriseId)
+    public void setBeyondEnterpriseId(String beyondEnterpriseId)
     {
         this.beyondEnterpriseId = beyondEnterpriseId;
     }
 
-    public Long getBeyondEnterpriseId()
+    public String getBeyondEnterpriseId()
     {
         return beyondEnterpriseId;
     }

zh-baseversion-system/src/main/java/com/zehong/system/domain/TProjectInfo.java

@@ -30,7 +30,7 @@ public class TProjectInfo extends BaseEntity
     private String enterpriseCode;
 
     /** 权属单位 */
-    private Long beyondEnterpriseId;
+    private String beyondEnterpriseId;
 
     /** 门站地址 */
     @Excel(name = "门站地址")
@@ -62,11 +62,11 @@ public class TProjectInfo extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
-    public Long getBeyondEnterpriseId() {
+    public String getBeyondEnterpriseId() {
         return beyondEnterpriseId;
     }
 
-    public void setBeyondEnterpriseId(Long beyondEnterpriseId) {
+    public void setBeyondEnterpriseId(String beyondEnterpriseId) {
         this.beyondEnterpriseId = beyondEnterpriseId;
     }
 

zh-baseversion-system/src/main/java/com/zehong/system/domain/TSiteStationInfo.java

@@ -36,7 +36,7 @@ public class TSiteStationInfo extends BaseEntity
     private String buildUnit;
 
     /** 权属单位 */
-    private Long beyondEnterpriseId;
+    private String beyondEnterpriseId;
 
     /** 权属单位名称 */
     @Excel(name = "权属单位名称")
@@ -139,12 +139,12 @@ public class TSiteStationInfo extends BaseEntity
     {
         return buildUnit;
     }
-    public void setBeyondEnterpriseId(Long beyondEnterpriseId)
+    public void setBeyondEnterpriseId(String beyondEnterpriseId)
     {
         this.beyondEnterpriseId = beyondEnterpriseId;
     }
 
-    public Long getBeyondEnterpriseId()
+    public String getBeyondEnterpriseId()
     {
         return beyondEnterpriseId;
     }

zh-baseversion-system/src/main/java/com/zehong/system/domain/TVideoManager.java

@@ -45,7 +45,7 @@ public class TVideoManager extends BaseEntity
 
     /** 所属企业 */
     @Excel(name = "所属企业")
-    private Long beyondEnterpriseId;
+    private String beyondEnterpriseId;
 
     /** 所属企业名称 */
     @Excel(name = "所属企业名称")
@@ -122,12 +122,12 @@ public class TVideoManager extends BaseEntity
     {
         return type;
     }
-    public void setBeyondEnterpriseId(Long beyondEnterpriseId) 
+    public void setBeyondEnterpriseId(String beyondEnterpriseId)
     {
         this.beyondEnterpriseId = beyondEnterpriseId;
     }
 
-    public Long getBeyondEnterpriseId() 
+    public String getBeyondEnterpriseId()
     {
         return beyondEnterpriseId;
     }

zh-baseversion-system/src/main/java/com/zehong/system/domain/TWorkOrder.java

@@ -48,7 +48,7 @@ public class TWorkOrder extends BaseEntity
 
     /** 指派单位id */
     @Excel(name = "指派单位id")
-    private Long workAssignEnterproseId;
+    private String workAssignEnterproseId;
 
     /** 指派人 */
     @Excel(name = "指派人")
@@ -243,12 +243,12 @@ public class TWorkOrder extends BaseEntity
     {
         return workAssignEnterproseName;
     }
-    public void setWorkAssignEnterproseId(Long workAssignEnterproseId) 
+    public void setWorkAssignEnterproseId(String workAssignEnterproseId)
     {
         this.workAssignEnterproseId = workAssignEnterproseId;
     }
 
-    public Long getWorkAssignEnterproseId() 
+    public String getWorkAssignEnterproseId()
     {
         return workAssignEnterproseId;
     }

zh-baseversion-system/src/main/java/com/zehong/system/domain/TWorkTask.java

@@ -41,7 +41,7 @@ public class TWorkTask extends BaseEntity
 
     /** 创建企业id */
     @Excel(name = "创建企业id")
-    private Long createEnterpriseId;
+    private String createEnterpriseId;
 
     private String groupNum;
 
@@ -166,12 +166,12 @@ public class TWorkTask extends BaseEntity
     {
         return status;
     }
-    public void setCreateEnterpriseId(Long createEnterpriseId) 
+    public void setCreateEnterpriseId(String createEnterpriseId)
     {
         this.createEnterpriseId = createEnterpriseId;
     }
 
-    public Long getCreateEnterpriseId() 
+    public String getCreateEnterpriseId()
     {
         return createEnterpriseId;
     }

zh-baseversion-system/src/main/java/com/zehong/system/domain/form/THiddenDangerStandingBookForm.java

@@ -32,6 +32,6 @@ public class THiddenDangerStandingBookForm
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date hiddenFindDateEnd;
 
-    private Long beyondEnterpriseId;
+    private String beyondEnterpriseId;
 
 }

zh-baseversion-system/src/main/java/com/zehong/system/domain/vo/TDetectorUserInspectVo.java

@@ -24,7 +24,7 @@ public class TDetectorUserInspectVo {
     private String nickName;
 
     /** 权属单位 */
-    private Long beyondEnterpriseId;
+    private String beyondEnterpriseId;
 
     /** 用户类型（1居民用户，2商业用户，3工业用户） */
     @Excel(name = "用户类型")
@@ -101,11 +101,11 @@ public class TDetectorUserInspectVo {
     }
 
 
-    public Long getBeyondEnterpriseId() {
+    public String getBeyondEnterpriseId() {
         return beyondEnterpriseId;
     }
 
-    public void setBeyondEnterpriseId(Long beyondEnterpriseId) {
+    public void setBeyondEnterpriseId(String beyondEnterpriseId) {
         this.beyondEnterpriseId = beyondEnterpriseId;
     }
 

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TDetectorUserMapper.java

@@ -98,7 +98,7 @@ public interface TDetectorUserMapper
      * 查询用户统计信息
      * @return
      */
-    TDetectorUserCount userStatistics(Long id);
+    TDetectorUserCount userStatistics(String id);
 
     /**
      * 获取用户安检信息

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TEmployedPeopleInfoMapper.java

@@ -64,12 +64,12 @@ public interface TEmployedPeopleInfoMapper
      * 企业信息查询(下拉框数据)
      * @return
      */
-    List<TEnterpriseInfo> selectTEnterprise(Long deptId);
+    List<TEnterpriseInfo> selectTEnterprise(String deptId);
 
     /**
      * 根据企业id查询企业名称
      * @param bId
      * @return
      */
-    String selectEnterpriseName(Long bId);
+    String selectEnterpriseName(String bId);
 }

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TEnterpriseInfoMapper.java

@@ -17,7 +17,7 @@ public interface TEnterpriseInfoMapper
      * @param enterpriseId 企业信息ID
      * @return 企业信息
      */
-    public TEnterpriseInfo selectTEnterpriseInfoById(Long enterpriseId);
+    public TEnterpriseInfo selectTEnterpriseInfoById(String enterpriseId);
 
     /**
      * 查询企业信息列表
@@ -49,7 +49,7 @@ public interface TEnterpriseInfoMapper
      * @param enterpriseId 企业信息ID
      * @return 结果
      */
-    public int deleteTEnterpriseInfoById(Long enterpriseId);
+    public int deleteTEnterpriseInfoById(String enterpriseId);
 
     /**
      * 批量删除企业信息
@@ -57,5 +57,5 @@ public interface TEnterpriseInfoMapper
      * @param enterpriseIds 需要删除的数据ID
      * @return 结果
      */
-    public int deleteTEnterpriseInfoByIds(Long[] enterpriseIds);
+    public int deleteTEnterpriseInfoByIds(String[] enterpriseIds);
 }

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TProjectInfoMapper.java

@@ -68,13 +68,13 @@ public interface TProjectInfoMapper
      * @param projectYear
      * @return
      */
-    List<TProjectInfo> selectSameYear(@Param("projectYear") Date projectYear,@Param("beyondEnterpriseId") Long beyondEnterpriseId);
+    List<TProjectInfo> selectSameYear(@Param("projectYear") Date projectYear,@Param("beyondEnterpriseId") String beyondEnterpriseId);
 
     /**
      * 重复年份删除方法
      * @param isSameYear
      */
-    void deleteisSameYear(@Param("isSameYear")Date isSameYear,@Param("beyondEnterpriseId")Long beyondEnterpriseId);
+    void deleteisSameYear(@Param("isSameYear")Date isSameYear,@Param("beyondEnterpriseId")String beyondEnterpriseId);
 
     /**
      * 查询修改文件之前的路径
@@ -88,7 +88,7 @@ public interface TProjectInfoMapper
      * @param deptId
      * @return
      */
-    String selectEnterpriseName(Long deptId);
+    String selectEnterpriseName(String deptId);
 
     /**
      *

zh-baseversion-system/src/main/java/com/zehong/system/service/ITDetectorUserService.java

@@ -107,7 +107,7 @@ public interface ITDetectorUserService
      * 查询用户统计信息
      * @return
      */
-    TDetectorUserCount userStatistics(Long id);
+    TDetectorUserCount userStatistics(String id);
 
     /**
      * 获取用户安检信息

zh-baseversion-system/src/main/java/com/zehong/system/service/ITEmployedPeopleInfoService.java

@@ -64,11 +64,11 @@ public interface ITEmployedPeopleInfoService
      * 企业信息查询(下拉框数据)
      * @return
      */
-    public List<TEnterpriseInfo> selectTEnterprise(Long deptId);
+    public List<TEnterpriseInfo> selectTEnterprise(String deptId);
 
     /**
      * 根据企业id查询企业名称
      * @return
      */
-    String selectEnterpriseName(Long bId);
+    String selectEnterpriseName(String bId);
 }

zh-baseversion-system/src/main/java/com/zehong/system/service/ITEnterpriseInfoService.java

@@ -18,7 +18,7 @@ public interface ITEnterpriseInfoService
      * @param enterpriseId 企业信息ID
      * @return 企业信息
      */
-    public TEnterpriseInfo selectTEnterpriseInfoById(Long enterpriseId);
+    public TEnterpriseInfo selectTEnterpriseInfoById(String enterpriseId);
 
     public List<TEnterpriseInfoVO> enterpriseInfoList(TEnterpriseInfo tEnterpriseInfo);
 
@@ -52,7 +52,7 @@ public interface ITEnterpriseInfoService
      * @param enterpriseIds 需要删除的企业信息ID
      * @return 结果
      */
-    public int deleteTEnterpriseInfoByIds(Long[] enterpriseIds);
+    public int deleteTEnterpriseInfoByIds(String[] enterpriseIds);
 
     /**
      * 删除企业信息信息
@@ -60,7 +60,7 @@ public interface ITEnterpriseInfoService
      * @param enterpriseId 企业信息ID
      * @return 结果
      */
-    public int deleteTEnterpriseInfoById(Long enterpriseId);
+    public int deleteTEnterpriseInfoById(String enterpriseId);
 
 
 }

zh-baseversion-system/src/main/java/com/zehong/system/service/ITProjectInfoService.java

@@ -67,13 +67,13 @@ public interface ITProjectInfoService
      * @param projectYear
      * @return
      */
-    List<TProjectInfo> selectSameYear(Date projectYear,Long beyondEnterpriseId);
+    List<TProjectInfo> selectSameYear(Date projectYear,String beyondEnterpriseId);
 
     /**
      * 重复年份删除方法
      * @param isSameYear
      */
-    void deleteisSameYear(Date isSameYear,Long beyondEnterpriseId);
+    void deleteisSameYear(Date isSameYear,String beyondEnterpriseId);
 
     /**
      * 查询修改文件之前的路径
@@ -86,7 +86,7 @@ public interface ITProjectInfoService
      * @param deptId
      * @return
      */
-    String selectEnterpriseName(Long deptId);
+    String selectEnterpriseName(String deptId);
 
     Map<String,Object> selectNum();
 }

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TDetectorUserServiceImpl.java

@@ -232,7 +232,7 @@ public class TDetectorUserServiceImpl implements ITDetectorUserService
      * @return
      */
     @Override
-    public TDetectorUserCount userStatistics(Long id) {
+    public TDetectorUserCount userStatistics(String id) {
         return tDetectorUserMapper.userStatistics(id);
     }
 

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TEmployedPeopleInfoServiceImpl.java

@@ -100,7 +100,7 @@ public class TEmployedPeopleInfoServiceImpl implements ITEmployedPeopleInfoServi
      * @return
      */
     @Override
-    public List<TEnterpriseInfo> selectTEnterprise(Long deptId) {
+    public List<TEnterpriseInfo> selectTEnterprise(String deptId) {
         return tEmployedPeopleInfoMapper.selectTEnterprise(deptId);
     }
 
@@ -110,7 +110,7 @@ public class TEmployedPeopleInfoServiceImpl implements ITEmployedPeopleInfoServi
      * @return
      */
     @Override
-    public String selectEnterpriseName(Long bId) {
+    public String selectEnterpriseName(String bId) {
         String s = tEmployedPeopleInfoMapper.selectEnterpriseName(bId);
         return s;
     }

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TEnterpriseInfoServiceImpl.java

@@ -30,7 +30,7 @@ public class TEnterpriseInfoServiceImpl implements ITEnterpriseInfoService
      * @return 企业信息
      */
     @Override
-    public TEnterpriseInfo selectTEnterpriseInfoById(Long enterpriseId)
+    public TEnterpriseInfo selectTEnterpriseInfoById(String enterpriseId)
     {
         return tEnterpriseInfoMapper.selectTEnterpriseInfoById(enterpriseId);
     }
@@ -101,7 +101,7 @@ public class TEnterpriseInfoServiceImpl implements ITEnterpriseInfoService
      * @return 结果
      */
     @Override
-    public int deleteTEnterpriseInfoByIds(Long[] enterpriseIds)
+    public int deleteTEnterpriseInfoByIds(String[] enterpriseIds)
     {
         return tEnterpriseInfoMapper.deleteTEnterpriseInfoByIds(enterpriseIds);
     }
@@ -113,7 +113,7 @@ public class TEnterpriseInfoServiceImpl implements ITEnterpriseInfoService
      * @return 结果
      */
     @Override
-    public int deleteTEnterpriseInfoById(Long enterpriseId)
+    public int deleteTEnterpriseInfoById(String enterpriseId)
     {
         return tEnterpriseInfoMapper.deleteTEnterpriseInfoById(enterpriseId);
     }

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TProjectInfoServiceImpl.java

@@ -103,7 +103,7 @@ public class TProjectInfoServiceImpl implements ITProjectInfoService
      * @return
      */
     @Override
-    public List<TProjectInfo> selectSameYear(Date projectYear,Long beyondEnterpriseId) {
+    public List<TProjectInfo> selectSameYear(Date projectYear,String beyondEnterpriseId) {
         List<TProjectInfo> tProjectInfos = tProjectInfoMapper.selectSameYear(projectYear,beyondEnterpriseId);
         return tProjectInfos;
     }
@@ -113,7 +113,7 @@ public class TProjectInfoServiceImpl implements ITProjectInfoService
      * @param isSameYear
      */
     @Override
-    public void deleteisSameYear(Date isSameYear,Long beyondEnterpriseId) {
+    public void deleteisSameYear(Date isSameYear,String beyondEnterpriseId) {
         tProjectInfoMapper.deleteisSameYear(isSameYear,beyondEnterpriseId);
     }
 
@@ -134,7 +134,7 @@ public class TProjectInfoServiceImpl implements ITProjectInfoService
      * @return
      */
     @Override
-    public String selectEnterpriseName(Long deptId) {
+    public String selectEnterpriseName(String deptId) {
         String enterpriseName = tProjectInfoMapper.selectEnterpriseName(deptId);
         return enterpriseName;
     }

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TWorkOrderServiceImpl.java

@@ -96,7 +96,7 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
         SysUser user = SecurityUtils.getLoginUser().getUser();
         tWorkOrder.setCreateTime(DateUtils.getNowDate());
         tWorkOrder.setCreateBy(SecurityUtils.getUsername());
-        Long enterpriseId = user.getDeptId();
+        String enterpriseId = user.getDeptId();
         if(null != enterpriseId){
             if("-2".equals(enterpriseId.toString())){
                 tWorkOrder.setWorkCreateEnterpriseId("-2");
@@ -118,8 +118,8 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
             }
         }
         if(tWorkOrder.getCreateType() != null && tWorkOrder.getCreateType()==2){
-            tWorkOrder.setShangbaoTime(new Date(new Date().getTime()+1000*60*5));
-            tWorkOrder.setJiedanTime(new Date(new Date().getTime()-1000*60*5));
+            tWorkOrder.setShangbaoTime(new Date(System.currentTimeMillis()+1000*60*5));
+            tWorkOrder.setJiedanTime(new Date(System.currentTimeMillis()-1000*60*5));
         }
         return tWorkOrderMapper.insertTWorkOrder(tWorkOrder);
     }

zh-baseversion-system/src/main/resources/mapper/system/TEnterpriseInfoMapper.xml

@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by enterprise_id desc
     </select>
 
-    <select id="selectTEnterpriseInfoById" parameterType="Long" resultMap="TEnterpriseInfoResult">
+    <select id="selectTEnterpriseInfoById" parameterType="String" resultMap="TEnterpriseInfoResult">
         <include refid="selectTEnterpriseInfoVo"/>
         where enterprise_id = #{enterpriseId} and is_del='0'
     </select>
@@ -61,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTEnterpriseInfo" parameterType="TEnterpriseInfo" useGeneratedKeys="true" keyProperty="enterpriseId">
         insert into t_enterprise_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="enterpriseId != null">enterprise_id,</if>
             <if test="createEnterpriseId != null">create_enterprise_id,</if>
             <if test="enterpriseName != null">enterprise_name,</if>
             <if test="enterpriseType!=null">enterprise_type,</if>
@@ -82,6 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="doDusiness != null">do_business,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="enterpriseId != null">#{enterpriseId},</if>
             <if test="createEnterpriseId != null">#{createEnterpriseId},</if>
             <if test="enterpriseName != null">#{enterpriseName},</if>
             <if test="enterpriseType != null"> #{enterpriseType},</if>
@@ -128,7 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where enterprise_id = #{enterpriseId}
     </update>
 
-    <update id="deleteTEnterpriseInfoById" parameterType="Long">
+    <update id="deleteTEnterpriseInfoById" parameterType="String">
         update  t_enterprise_info set is_del='1' where enterprise_id = #{enterpriseId}
     </update>