diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/base/TokenReqVo.java b/ruoyi-admin/src/main/java/com/ruoyi/api/base/TokenReqVo.java index 63bbf0c7..6b334d76 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/base/TokenReqVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/base/TokenReqVo.java @@ -50,16 +50,12 @@ public class TokenReqVo { public Boolean getLoginSign(String privateKey) { boolean signFlag = false; try { - if(!checkTimestamp()){ - throw new ServiceException(HttpStatusEnum.SINGET_TIMEOUT.getInfo(),HttpStatusEnum.SINGET_TIMEOUT.getCode()); - } String decryptByPrivateKey = AuthRsaUtils.decryptByPrivateKey(privateKey,sign); if (StringUtils.equals(appId + timestamp, decryptByPrivateKey)) { signFlag = true; } } catch (Exception e) { log.error(e.getMessage()); - throw new ServiceException(HttpStatusEnum.SINGET_EXCEPTION.getInfo(),HttpStatusEnum.SINGET_EXCEPTION.getCode()); } return signFlag; } @@ -67,7 +63,7 @@ public class TokenReqVo { /** * 效验时间签名[3分钟有效期] */ - private Boolean checkTimestamp() { + public Boolean checkTimestamp() { boolean timestampFlag = false; long timePoor = Math.abs(timestamp - System.currentTimeMillis()); if (timePoor < 1000 * 60 * 3) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/labour/controller/LabourApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/labour/controller/LabourApiController.java index 49beb50f..b3d76347 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/labour/controller/LabourApiController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/labour/controller/LabourApiController.java @@ -101,6 +101,9 @@ public class LabourApiController extends BaseController { } AjaxResult ajax = AjaxResult.success(); String Authorization = ""; + if(!req.checkTimestamp()){ + throw new ServiceException(HttpStatusEnum.SINGET_TIMEOUT.getInfo(),HttpStatusEnum.SINGET_TIMEOUT.getCode()); + } if (req.getLoginSign(sysApplyConfig.getPrivateKey())) { Authorization = this.getAppIdLoginToken(req.getAppId(),sysApplyConfig); } else { @@ -153,6 +156,9 @@ public class LabourApiController extends BaseController { if(StringUtils.equals(ShiFouEnum.SHI.getCode(),sysApplyConfig.getIsDel())){ throw new ServiceException(HttpStatusEnum.DISABLE.getInfo(),HttpStatusEnum.DISABLE.getCode()); } + if(!req.checkTimestamp()){ + throw new ServiceException(HttpStatusEnum.SINGET_TIMEOUT.getInfo(),HttpStatusEnum.SINGET_TIMEOUT.getCode()); + } if(req.getDataSign(sysApplyConfig.getPrivateKey())){ try { SurProjectAttendanceGroup surProjectAttendanceGroup = JSONObject.parseObject(req.getData(), SurProjectAttendanceGroup.class); @@ -194,7 +200,7 @@ public class LabourApiController extends BaseController { throw new ServiceException(e.getMessage(),HttpStatusEnum.DARA_EXCEPTION.getCode()); } }else{ - throw new ServiceException(HttpStatusEnum.SINGET_TIMEOUT.getInfo(),HttpStatusEnum.SINGET_TIMEOUT.getCode()); + throw new ServiceException(HttpStatusEnum.SINGET_ERROR.getInfo(),HttpStatusEnum.SINGET_ERROR.getCode()); } return success(); } @@ -214,6 +220,9 @@ public class LabourApiController extends BaseController { if(StringUtils.equals(ShiFouEnum.SHI.getCode(),sysApplyConfig.getIsDel())){ throw new ServiceException(HttpStatusEnum.DISABLE.getInfo(),HttpStatusEnum.DISABLE.getCode()); } + if(!req.checkTimestamp()){ + throw new ServiceException(HttpStatusEnum.SINGET_TIMEOUT.getInfo(),HttpStatusEnum.SINGET_TIMEOUT.getCode()); + } if(req.getDataSign(sysApplyConfig.getPrivateKey())){ try { // 保存集合 @@ -254,7 +263,7 @@ public class LabourApiController extends BaseController { throw new ServiceException(e.getMessage(),HttpStatusEnum.DARA_EXCEPTION.getCode()); } }else{ - throw new ServiceException(HttpStatusEnum.SINGET_TIMEOUT.getInfo(),HttpStatusEnum.SINGET_TIMEOUT.getCode()); + throw new ServiceException(HttpStatusEnum.SINGET_ERROR.getInfo(),HttpStatusEnum.SINGET_ERROR.getCode()); } return success(); } @@ -274,6 +283,9 @@ public class LabourApiController extends BaseController { if(StringUtils.equals(ShiFouEnum.SHI.getCode(),sysApplyConfig.getIsDel())){ throw new ServiceException(HttpStatusEnum.DISABLE.getInfo(),HttpStatusEnum.DISABLE.getCode()); } + if(!req.checkTimestamp()){ + throw new ServiceException(HttpStatusEnum.SINGET_TIMEOUT.getInfo(),HttpStatusEnum.SINGET_TIMEOUT.getCode()); + } if(req.getDataSign(sysApplyConfig.getPrivateKey())){ try { SurProjectAttendanceUser surProjectAttendanceUser = JSONObject.parseObject(req.getData(), SurProjectAttendanceUser.class); @@ -315,7 +327,7 @@ public class LabourApiController extends BaseController { throw new ServiceException(e.getMessage(),HttpStatusEnum.DARA_EXCEPTION.getCode()); } }else{ - throw new ServiceException(HttpStatusEnum.SINGET_TIMEOUT.getInfo(),HttpStatusEnum.SINGET_TIMEOUT.getCode()); + throw new ServiceException(HttpStatusEnum.SINGET_ERROR.getInfo(),HttpStatusEnum.SINGET_ERROR.getCode()); } return success(); } @@ -335,6 +347,9 @@ public class LabourApiController extends BaseController { if(StringUtils.equals(ShiFouEnum.SHI.getCode(),sysApplyConfig.getIsDel())){ throw new ServiceException(HttpStatusEnum.DISABLE.getInfo(),HttpStatusEnum.DISABLE.getCode()); } + if(!req.checkTimestamp()){ + throw new ServiceException(HttpStatusEnum.SINGET_TIMEOUT.getInfo(),HttpStatusEnum.SINGET_TIMEOUT.getCode()); + } if(req.getDataSign(sysApplyConfig.getPrivateKey())){ try { // 保存集合 @@ -375,7 +390,7 @@ public class LabourApiController extends BaseController { throw new ServiceException(e.getMessage(),HttpStatusEnum.DARA_EXCEPTION.getCode()); } }else{ - throw new ServiceException(HttpStatusEnum.SINGET_TIMEOUT.getInfo(),HttpStatusEnum.SINGET_TIMEOUT.getCode()); + throw new ServiceException(HttpStatusEnum.SINGET_ERROR.getInfo(),HttpStatusEnum.SINGET_ERROR.getCode()); } return success(); } @@ -395,6 +410,9 @@ public class LabourApiController extends BaseController { if(StringUtils.equals(ShiFouEnum.SHI.getCode(),sysApplyConfig.getIsDel())){ throw new ServiceException(HttpStatusEnum.DISABLE.getInfo(),HttpStatusEnum.DISABLE.getCode()); } + if(!req.checkTimestamp()){ + throw new ServiceException(HttpStatusEnum.SINGET_TIMEOUT.getInfo(),HttpStatusEnum.SINGET_TIMEOUT.getCode()); + } if(req.getDataSign(sysApplyConfig.getPrivateKey())){ try { SurProjectAttendanceData surProjectAttendanceData = JSONObject.parseObject(req.getData(), SurProjectAttendanceData.class); @@ -438,7 +456,7 @@ public class LabourApiController extends BaseController { throw new ServiceException(e.getMessage(),HttpStatusEnum.DARA_EXCEPTION.getCode()); } }else{ - throw new ServiceException(HttpStatusEnum.SINGET_TIMEOUT.getInfo(),HttpStatusEnum.SINGET_TIMEOUT.getCode()); + throw new ServiceException(HttpStatusEnum.SINGET_ERROR.getInfo(),HttpStatusEnum.SINGET_ERROR.getCode()); } return success(); } @@ -458,6 +476,9 @@ public class LabourApiController extends BaseController { if(StringUtils.equals(ShiFouEnum.SHI.getCode(),sysApplyConfig.getIsDel())){ throw new ServiceException(HttpStatusEnum.DISABLE.getInfo(),HttpStatusEnum.DISABLE.getCode()); } + if(!req.checkTimestamp()){ + throw new ServiceException(HttpStatusEnum.SINGET_TIMEOUT.getInfo(),HttpStatusEnum.SINGET_TIMEOUT.getCode()); + } if(req.getDataSign(sysApplyConfig.getPrivateKey())){ try { // 保存集合 @@ -498,14 +519,14 @@ public class LabourApiController extends BaseController { throw new ServiceException(e.getMessage(),HttpStatusEnum.DARA_EXCEPTION.getCode()); } }else{ - throw new ServiceException(HttpStatusEnum.SINGET_TIMEOUT.getInfo(),HttpStatusEnum.SINGET_TIMEOUT.getCode()); + throw new ServiceException(HttpStatusEnum.SINGET_ERROR.getInfo(),HttpStatusEnum.SINGET_ERROR.getCode()); } return success(); } - private static final String publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDMIBL0C+sN2oZEaCscc8gaEjXv87F/Ggml4XcjFmWaw8xQ0vfwGzY6wdG6eTMLW0FV3GSSxs2lsVJnrjkHNAnqFoMGn3RHcHnrIlAm4+ALt8S4rQ1TIgqzuasuVykUkGunTDYzAEcObTkZ70ZToj8qQwRCkskfgbUIiw4XpXqS2QIDAQAB"; - private static final String baseUrl = "http://127.0.0.1:8090/jhapi"; - private static final String token = "eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjMyZTJlYmY2LTE1NjktNDk1OS1iZDY4LTM1NWZhZGQxNjNiMyJ9.TM1mm-Nxr3g5HkUNt5gaDdN_nHKcQ8OiZYX6K1M5K8odLounSBxXzFlBzy3BndyhzkUmPbSIAO8yMD9up-FTYQ"; + private static final String publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCZjinQdEjtWt+4EiXIa/xVz4pfcOPYzZUMCAh1xXG9+2j6Wb++XoajlgVxjL/XkK3CnZh9PjrUxWpnQKEVt+QyIS1O0yCiZjMzaQ4sHoMs4uPYh8fyYAuL4uF/6R2x0/PL460quC1aMTmdSdXWLlIiwk5ZRm7YB/k1Nb/P91MKwIDAQAB"; + private static final String baseUrl = "http://62.234.3.186:8090/jhapi"; + private static final String token = "eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImYyZmUzYTFhLWI2NDQtNGVmZC05NTZiLTYyMDk3Y2I5M2JmNSJ9.B_Rszwgn_pE3cZDNyjY9Di6BVxzslJYlBVmpo-6IiG4LJst4o0-WvSE3lRgamMr006Ey_L04SBlildae8PH4BQ"; /** * 推送,修改班组信息【示例代码】 @@ -542,14 +563,15 @@ public class LabourApiController extends BaseController { */ public static void pushLabourGroup(){ Map map = new HashMap<>(); - map.put("serverid","1"); - map.put("companyId",123); - map.put("companyName","1222222222222222222222222"); - map.put("companyTypeId","1"); - map.put("name","12"); + map.put("serverid","5013720"); + map.put("companyId",5002894); + map.put("companyCode","91361122553504962W"); + map.put("companyName","江西省子金建设工程有限公司"); + map.put("companyTypeId","2"); + map.put("name","江西子金管理"); map.put("isDel",1); String jsonString = JSONObject.toJSONString(map); - String timestamp = String.valueOf(System.currentTimeMillis()); + String timestamp = "1705915778869";//String.valueOf(System.currentTimeMillis()); try { // 明文信息->公钥加密 String encryptByPublicKeyStr = AuthRsaUtils.encryptByPublicKey(publicKey, Md5Utils.hash(jsonString)+timestamp); @@ -815,7 +837,7 @@ public class LabourApiController extends BaseController { } public static void main(String[] args) { - pushLabourUser(); + pushLabourGroup(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/labour/domain/LabourSignetVo.java b/ruoyi-admin/src/main/java/com/ruoyi/api/labour/domain/LabourSignetVo.java index 58423c40..67091400 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/labour/domain/LabourSignetVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/labour/domain/LabourSignetVo.java @@ -50,9 +50,6 @@ public class LabourSignetVo { public Boolean getDataSign(String privateKey) { boolean signFlag = false; try { - if(!checkTimestamp()){ - throw new ServiceException(HttpStatusEnum.SINGET_TIMEOUT.getInfo(),HttpStatusEnum.SINGET_TIMEOUT.getCode()); - } String decryptByPrivateKey = AuthRsaUtils.decryptByPrivateKey(privateKey,sign); String privateDataStr = Md5Utils.hash(data) + timestamp; log.info("签名值...{}",privateDataStr); @@ -62,7 +59,6 @@ public class LabourSignetVo { } } catch (Exception e) { log.error(e.getMessage()); - throw new ServiceException(HttpStatusEnum.SINGET_EXCEPTION.getInfo(),HttpStatusEnum.SINGET_EXCEPTION.getCode()); } return signFlag; } diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index df613172..0a4cb247 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -40,7 +40,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://cd-cynosdbmysql-grp-9rqrhxsm.sql.tencentcdb.com:27981/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 + url: jdbc:mysql://cd-cynosdbmysql-grp-9rqrhxsm.sql.tencentcdb.com:27981/yanzhu_jh_test?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8 username: root password: Sxyanzhu@cf # 从库数据源 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index f449f345..9ffbc07b 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -20,7 +20,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: druid + active: test # 文件上传 servlet: multipart: diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java index baf6cd74..b0516d9b 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectChecking.java @@ -21,11 +21,16 @@ public class SurProjectChecking extends BaseEntity private Long id; /** 项目主键 */ - @Excel(name = "项目主键") + private Long projectId; + @Excel(name = "项目名称") + private String projectName; + /** 部门主键 */ - @Excel(name = "部门主键") + @Excel(name = "单位名称") + private String deptName; + private Long deptId; /** 分包单位主键 */ @@ -36,6 +41,12 @@ public class SurProjectChecking extends BaseEntity @Excel(name = "验收类型") private String checkType; + @Excel(name = "验收大类") + private String dataTypeLvl1Name; + + @Excel(name = "大类分类") + private String dataTypeLvl2Name; + /** 验收主图 */ @Excel(name = "验收主图") private String mainImage; @@ -129,10 +140,7 @@ public class SurProjectChecking extends BaseEntity private String dataTypeLvl2; - private String projectName; - private String deptName; - private String dataTypeLvl1Name; - private String dataTypeLvl2Name; + public void setId(Long id) { diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectInsurance.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectInsurance.java index 477bff58..bf870930 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectInsurance.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectInsurance.java @@ -21,13 +21,17 @@ public class SurProjectInsurance extends BaseEntity private Long id; /** 项目主键 */ - @Excel(name = "项目主键") private Long projectId; /** 部门主键 */ - @Excel(name = "部门主键") private Long deptId; + @Excel(name = "项目名称") + private String projectName; + + @Excel(name = "单位名称") + private String deptName; + /** 保险类型 */ @Excel(name = "保险类型") private String insuranceType; @@ -63,8 +67,6 @@ public class SurProjectInsurance extends BaseEntity private String isDel; private String insuranceTypeName; - private String projectName; - private String deptName; public void setId(Long id) { diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMaterialSeal.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMaterialSeal.java index c8b80c82..bd9ebeb9 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMaterialSeal.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMaterialSeal.java @@ -21,13 +21,17 @@ public class SurProjectMaterialSeal extends BaseEntity private Long id; /** 项目主键 */ - @Excel(name = "项目主键") private Long projectId; /** 部门主键 */ - @Excel(name = "部门主键") private Long deptId; + @Excel(name = "项目名称") + private String projectName; + + @Excel(name = "单位名称") + private String deptName; + /** 封样主图 */ @Excel(name = "封样主图") private String mainImage; @@ -85,10 +89,7 @@ public class SurProjectMaterialSeal extends BaseEntity @Excel(name = "监理人名称") private String witnessUserName; - private String projectName; - private String deptName; - - public void setId(Long id) + public void setId(Long id) { this.id = id; } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMeasure.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMeasure.java index bdfaa6d6..1a8b70f8 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMeasure.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectMeasure.java @@ -21,13 +21,17 @@ public class SurProjectMeasure extends BaseEntity private Long id; /** 项目主键 */ - @Excel(name = "项目主键") private Long projectId; /** 部门主键 */ - @Excel(name = "部门主键") private Long deptId; + @Excel(name = "项目名称") + private String projectName; + + @Excel(name = "单位名称") + private String deptName; + /** 测量主图 */ @Excel(name = "测量主图") private String mainImage; @@ -89,8 +93,6 @@ public class SurProjectMeasure extends BaseEntity @Excel(name = "审核状态") private String approveStatus; - private String projectName; - private String deptName; private String measureTypeName; private String measureInfoName; private String createByName; diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectUserinfo.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectUserinfo.java index 26832f9a..246121e2 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectUserinfo.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectUserinfo.java @@ -19,7 +19,6 @@ public class SurProjectUserinfo extends BaseEntity private Long id; /** 项目主键 */ - @Excel(name = "项目主键") private Long projectId; /** 项目主键 */ @@ -27,7 +26,6 @@ public class SurProjectUserinfo extends BaseEntity private String projectName; /** 部门主键 */ - @Excel(name = "部门主键") private Long deptId; /** 部门名称 */ diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectWorkSpecial.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectWorkSpecial.java index 8abcb440..79cb0c59 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectWorkSpecial.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectWorkSpecial.java @@ -21,15 +21,19 @@ public class SurProjectWorkSpecial extends BaseEntity private Long id; /** 项目主键 */ - @Excel(name = "项目主键") private Long projectId; /** 部门主键 */ - @Excel(name = "部门主键") private Long deptId; + @Excel(name = "项目名称") + private String projectName; + + @Excel(name = "单位名称") + private String deptName; + /** 特种人员类型 */ - @Excel(name = "特种人员类型") + @Excel(name = "特种人员类型", dictType = "project_special_type") private String specialType; /** 姓名 */ @@ -37,7 +41,7 @@ public class SurProjectWorkSpecial extends BaseEntity private String name; /** 性别 */ - @Excel(name = "性别") + @Excel(name = "性别" ,dictType = "sys_user_sex") private String sex; /** 年龄 */ @@ -77,8 +81,6 @@ public class SurProjectWorkSpecial extends BaseEntity @Excel(name = "删除标识") private Integer isDel; - private String projectName; - private String deptName; private String specialTypeName; public void setId(Long id) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java index 04cb3a6e..95c6ff1b 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java @@ -48,7 +48,6 @@ public class SmzSspProblemmodify extends BaseEntity private String lordSent; /** 主送人手机号 */ - @Excel(name = "整改人手机号") private String lordSentUser; /** 抄送人姓名 */ @@ -56,7 +55,6 @@ public class SmzSspProblemmodify extends BaseEntity private String copySend; /** 抄送人手机号 */ - @Excel(name = "抄送人手机号") private String copySendUser; /** 流程状态 */ @@ -69,7 +67,7 @@ public class SmzSspProblemmodify extends BaseEntity /** 留痕时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:ss") - @Excel(name = "留痕时间", width = 30, dateFormat = "yyyy-MM-dd HH:ss") + @Excel(name = "整改时间", width = 30, dateFormat = "yyyy-MM-dd HH:ss") private Date nickedTime; /** 工程类型 */ @@ -100,15 +98,13 @@ public class SmzSspProblemmodify extends BaseEntity private String createBy; /** 审核人 */ - @Excel(name = "审核人") private String checkUser; /** 审核人手机号 */ - @Excel(name = "审核人手机号") private String checkUserPhone; /** 删除状态 */ - @Excel(name = "删除状态") + @Excel(name = "数据状态") private Long isDel; /** 创建人 */ diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java index d75a9880..da779c0b 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java @@ -13,6 +13,8 @@ public class SmzSspProblemmodifyExport { @Excel(name = "总包单位",align= HorizontalAlignment.LEFT,width =30) private String deptName; + @Excel(name = "检查类型",align= HorizontalAlignment.LEFT,width =30) + private String problemType; @Excel(name = "隐患图片",isLink = true,color = IndexedColors.BLUE,linkText="查看图片") private String marksPicture; @Excel(name = "隐患类型" ,align= HorizontalAlignment.CENTER,width =24) @@ -45,15 +47,16 @@ public class SmzSspProblemmodifyExport { SmzSspProblemmodifyExport d=new SmzSspProblemmodifyExport(); d.problemArea=it.getProblemArea(); d.deptName=it.getDeptName(); + d.problemType=it.getProblemType().equals("1")?"常规检查":"专项检查"; d.dangerType=it.getDangerLabel(); d.workParts=it.getWorkParts(); d.changeInfo=it.getChangeInfo(); d.nickedTime=it.getNickedTime(); - d.lordSent=it.getLordSent()+" "+it.getLordSentUser(); + d.lordSent=it.getLordSent(); d.checkState=it.getChkLabel(); - d.recheckSend=it.getRecheckSend()+" "+it.getRecheckSendUser(); - d.copySend=it.getCopySend()+" "+it.getCopySendUser(); - d.createBy=it.getCreateBy()+" "+it.getCreateUser(); + d.recheckSend=it.getRecheckSend(); + d.copySend=it.getCopySend(); + d.createBy=it.getCreateBy(); d.createTime=it.getCreateTime(); d.marksPicture="http://62.234.3.186"+it.getMarksPicture(); return d; diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/controller/WorkTrainController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/controller/WorkTrainController.java index eae33730..af1d6c55 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/controller/WorkTrainController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/controller/WorkTrainController.java @@ -5,13 +5,14 @@ import javax.servlet.http.HttpServletResponse; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.enums.DeptTypeEnum; -import com.ruoyi.common.enums.SysRoleEnum; +import com.ruoyi.common.enums.*; import com.ruoyi.system.service.ISysDeptService; import com.yanzhu.jh.project.domain.SurProject; import com.yanzhu.jh.project.domain.SurProjectUnitInfo; import com.yanzhu.jh.project.service.ISurProjectService; import com.yanzhu.jh.project.service.ISurProjectUnitInfoService; +import com.yanzhu.jh.work.domain.WorkTrainDept; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -25,7 +26,6 @@ import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; import com.yanzhu.jh.work.domain.WorkTrain; import com.yanzhu.jh.work.service.IWorkTrainService; import com.ruoyi.common.utils.poi.ExcelUtil; @@ -91,7 +91,7 @@ public class WorkTrainController extends BaseController workTrain.setNowUserName(getUsername()); List list = workTrainService.selectWorkTrainList(workTrain); ExcelUtil util = new ExcelUtil(WorkTrain.class); - util.exportExcel(response, list, "演练培训数据"); + util.exportExcel(response, list, "应急演练数据"); } /** diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java index abf45af5..abbbf92c 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkTrain.java @@ -29,23 +29,29 @@ public class WorkTrain extends BaseEntity private String projectName; /** 主图 */ - @Excel(name = "主图") private String mainImage; /** 工作类型 */ - @Excel(name = "工作类型") + @Excel(name = "演训种类", dictType = "project_train_type") private String trainType; + /** 数据类型 */ + @Excel(name = "演训类型", dictType = "work_train_data_type") + private String dataType; + /** 工作标题 */ - @Excel(name = "工作标题") + @Excel(name = "演训标题") private String trainTitle; + /** 演训内容 */ + @Excel(name = "演训内容") + private String trainContent; + /** 工作性质 */ - @Excel(name = "工作性质") private String trainNature; /** 工作参与者 */ - @Excel(name = "工作参与者") + @Excel(name = "演训人数") private Long trainParticipants; /** 开始时间 */ @@ -58,21 +64,17 @@ public class WorkTrain extends BaseEntity @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") private Date endDate; + @Excel(name = "协作单位") + private String trainDeptNames; + /** 删除标识 */ - @Excel(name = "删除标识") + @Excel(name = "数据状态", dictType = "sys_common_isdel") private Long isDel; /** 演训内容 */ - @Excel(name = "演训内容") - private String trainContent; - - /** 演训内容 */ - @Excel(name = "演训内容") + //@Excel(name = "演训内容") private String trainFile; - /** 数据类型 */ - private String dataType; - public String getDataType() { return dataType; } @@ -85,7 +87,7 @@ public class WorkTrain extends BaseEntity private List workTrainDeptList; private String trainDeptIds; - private String trainDeptNames; + private String trainNatureName; private String vDel; private Long deptId;//子公司查询使用