diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/ApiConstants.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/ApiConstants.java new file mode 100644 index 00000000..19c4fcf2 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/ApiConstants.java @@ -0,0 +1,6 @@ +package com.zdxt.enforcementcode.common.util; + +public class ApiConstants { + + public static final String API_SIQUSERLOGIN= "/pub/auth/getUserInfo"; +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/HttpUtil.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/HttpUtil.java new file mode 100644 index 00000000..09477b1c --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/HttpUtil.java @@ -0,0 +1,63 @@ +package com.zdxt.enforcementcode.common.util; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.util.Map; + +public class HttpUtil { + + + private static final Logger log = LoggerFactory.getLogger(HttpUtil.class); + public static String httpSendPost(String url, String params, Map heardMap){ + try { + URL uri = new URL(url); + HttpURLConnection connection = (HttpURLConnection) uri.openConnection(); + connection.setRequestMethod("POST"); + connection.setRequestProperty("Content-Type","application/json"); + connection.setRequestProperty("Charsert","UTF-8"); + for (Map.Entry entry : heardMap.entrySet()) { + // 对value进行相应的操作 + connection.setRequestProperty(entry.getKey(), String.valueOf(entry.getValue())); + } + connection.setDoOutput(true); + DataOutputStream out = new DataOutputStream(connection.getOutputStream()); +// out.writeBytes(params); + out.write(params.getBytes(StandardCharsets.UTF_8)); //解决中文乱码 + out.flush(); + out.close(); + int responseCode = connection.getResponseCode(); + if(responseCode == HttpURLConnection.HTTP_OK){ + BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8)); + String inputLine; + StringBuffer response = new StringBuffer(); + + while ((inputLine = in.readLine()) != null){ + response.append(inputLine); + } + in.close(); + log.info(response.toString()); + System.out.println("请求成功"); + return response.toString(); + }else{ + log.error("============================== 深i企接口获取用户信息接口调用失败 =============================="); + log.error("---> 失败码：{}",responseCode); + log.error("---> url: {}",url); + log.error("---> params: {}",params); + log.error("---> heardMap: {}",heardMap); + log.error("============================== =========================== =============================="); +// BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8")); + } + } catch (Exception e) { + e.printStackTrace(); + } + + return ""; + } +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/UserConstants.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/UserConstants.java new file mode 100644 index 00000000..00d74cdc --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/UserConstants.java @@ -0,0 +1,133 @@ +package com.zdxt.enforcementcode.common.util; + +/** + * 用户常量信息 + * + * @author ruoyi + */ +public class UserConstants +{ + /** 正常状态 */ + public static final String NORMAL = "0"; + + /** 异常状态 */ + public static final String EXCEPTION = "1"; + + /** 用户封禁状态 */ + public static final String USER_BLOCKED = "1"; + + /** 角色封禁状态 */ + public static final String ROLE_BLOCKED = "1"; + + /** 部门正常状态 */ + public static final String DEPT_NORMAL = "0"; + + /** 字典正常状态 */ + public static final String DICT_NORMAL = "0"; + + /** 是否为系统默认（是） */ + public static final String YES = "Y"; + + /** 上移 */ + public static final String UP = "up"; + + /** 下移 */ + public static final String DOWN = "down"; + + /** + * 用户名长度限制 + */ + public static final int USERNAME_MIN_LENGTH = 2; + public static final int USERNAME_MAX_LENGTH = 20; + + /** 登录名称是否唯一的返回结果码 */ + public final static String USER_NAME_UNIQUE = "0"; + public final static String USER_NAME_NOT_UNIQUE = "1"; + + /** 手机号码是否唯一的返回结果 */ + public final static String USER_PHONE_UNIQUE = "0"; + public final static String USER_PHONE_NOT_UNIQUE = "1"; + + /** e-mail 是否唯一的返回结果 */ + public final static String USER_EMAIL_UNIQUE = "0"; + public final static String USER_EMAIL_NOT_UNIQUE = "1"; + + /** 部门名称是否唯一的返回结果码 */ + public final static String DEPT_NAME_UNIQUE = "0"; + public final static String DEPT_NAME_NOT_UNIQUE = "1"; + + /** 角色名称是否唯一的返回结果码 */ + public final static String ROLE_NAME_UNIQUE = "0"; + public final static String ROLE_NAME_NOT_UNIQUE = "1"; + + /** 岗位名称是否唯一的返回结果码 */ + public final static String POST_NAME_UNIQUE = "0"; + public final static String POST_NAME_NOT_UNIQUE = "1"; + + /** 角色权限是否唯一的返回结果码 */ + public final static String ROLE_KEY_UNIQUE = "0"; + public final static String ROLE_KEY_NOT_UNIQUE = "1"; + + /** 岗位编码是否唯一的返回结果码 */ + public final static String POST_CODE_UNIQUE = "0"; + public final static String POST_CODE_NOT_UNIQUE = "1"; + + /** 菜单名称是否唯一的返回结果码 */ + public final static String MENU_NAME_UNIQUE = "0"; + public final static String MENU_NAME_NOT_UNIQUE = "1"; + + /** 字典类型是否唯一的返回结果码 */ + public final static String DICT_TYPE_UNIQUE = "0"; + public final static String DICT_TYPE_NOT_UNIQUE = "1"; + + /** 编码是否唯一的返回结果码 */ + public final static String AUTOENCODER_UNIQUE = "0"; + public final static String AUTOENCODER_NOT_UNIQUE = "1"; + /** 编码正常状态 */ + public static final Integer AUTOENCODER_NORMAL = 0; + + /** 参数键名是否唯一的返回结果码 */ + public final static String CONFIG_KEY_UNIQUE = "0"; + public final static String CONFIG_KEY_NOT_UNIQUE = "1"; + + /** + * 密码长度限制 + */ + public static final int PASSWORD_MIN_LENGTH = 5; + public static final int PASSWORD_MAX_LENGTH = 20; + + /** + * 手机号码格式限制 + */ + public static final String MOBILE_PHONE_NUMBER_PATTERN = "^0{0,1}(13[0-9]|15[0-9]|14[0-9]|18[0-9])[0-9]{8}$"; + + /** + * 邮箱格式限制 + */ + public static final String EMAIL_PATTERN = "^((([a-z]|\\d|[!#\\$%&'\\*\\+\\-\\/=\\?\\^_`{\\|}~]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])+(\\.([a-z]|\\d|[!#\\$%&'\\*\\+\\-\\/=\\?\\^_`{\\|}~]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])+)*)|((\\x22)((((\\x20|\\x09)*(\\x0d\\x0a))?(\\x20|\\x09)+)?(([\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x7f]|\\x21|[\\x23-\\x5b]|[\\x5d-\\x7e]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])|(\\\\([\\x01-\\x09\\x0b\\x0c\\x0d-\\x7f]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]))))*(((\\x20|\\x09)*(\\x0d\\x0a))?(\\x20|\\x09)+)?(\\x22)))@((([a-z]|\\d|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])|(([a-z]|\\d|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])([a-z]|\\d|-|\\.|_|~|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])*([a-z]|\\d|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])))\\.)+(([a-z]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])|(([a-z]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])([a-z]|\\d|-|\\.|_|~|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])*([a-z]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])))\\.?"; + + /** + * 默认用户权限 + */ + public static final Long DEFAULT_ROLE = 178L; + + /** + * 默认密码 + */ + public static final String DEFAULT_PASSWORD = "szsf@zfjd"; + + /** + * 默认部门 + */ + public static final String DEFAULT_DEPT = "405"; + + /** + * 默认用户源 + */ + public static final Integer DEFAULT_USER_SOURCE = 1; + + /** + * 默认删除状态 + */ + public static final String NORMAL_DEL_FLAG = "0"; +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnforcementRegistrationController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnforcementRegistrationController.java index 4fe3f7d1..0e8e3a41 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnforcementRegistrationController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnforcementRegistrationController.java @@ -1,7 +1,6 @@ package com.zdxt.enforcementcode.controller.app.enterprise; import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; -import com.zdxt.enforcementcode.domain.dto.enterprise.EnforcementRegistrationQueryDTO; import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; import com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationDetailVo; import com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationListVo; @@ -42,8 +41,7 @@ public class AppEntEnforcementRegistrationController extends BaseController { * 前端企业端执法登记列表页面使用此接口 */ @GetMapping("/getEnterpriseEnforcementRegistrationList") - public TableDataInfo getEnterpriseEnforcementRegistrationList( - EnforcementRegistrationBo bo, PageQuery pageQuery) { + public TableDataInfo getEnterpriseEnforcementRegistrationList(EnforcementRegistrationBo bo, PageQuery pageQuery) { return enforcementRegistrationService.queryEnterprisePageList(bo, pageQuery); } @@ -51,8 +49,8 @@ public class AppEntEnforcementRegistrationController extends BaseController { * 企业端-执法登记列表（历史执法信息） */ @GetMapping("/queryEnforcementRegistrationPageList") - public TableDataInfo list(EnforcementRegistrationQueryDTO dto, PageQuery pageQuery) { - return enforcementRegistrationService.queryEnforcementRegistrationPageList(dto, pageQuery); + public TableDataInfo queryEnforcementRegistrationPageList(EnforcementRegistrationBo bo, PageQuery pageQuery) { + return enforcementRegistrationService.queryEnforcementRegistrationPageList(bo, pageQuery); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLawEnforcementCaseController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLawEnforcementCaseController.java index 5bf77835..38aca724 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLawEnforcementCaseController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLawEnforcementCaseController.java @@ -1,7 +1,7 @@ package com.zdxt.enforcementcode.controller.app.enterprise; -import com.zdxt.enforcementcode.domain.dto.enterprise.AppLawEnforcementCaseQueryDTO; +import com.zdxt.enforcementcode.domain.bo.enterprise.AppLawEnforcementCaseBo; import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnforcementRegistrationVo; import com.zdxt.enforcementcode.domain.vo.enterprise.AppLawEnforcementCaseVo; import com.zdxt.enforcementcode.service.enterprise.IAppLawEnforcementCaseService; @@ -37,30 +37,30 @@ public class AppEntLawEnforcementCaseController extends BaseController { */ @ApiResponse(description = "企业端-执法案件信息列表") @GetMapping("/list") - public TableDataInfo list(AppLawEnforcementCaseQueryDTO queryDTO, PageQuery pageQuery) { - return appLawEnforcementCaseService.selectAppLawEnforcementCaseList(queryDTO, pageQuery); + public TableDataInfo list(AppLawEnforcementCaseBo bo, PageQuery pageQuery) { + return appLawEnforcementCaseService.selectAppLawEnforcementCaseList(bo, pageQuery); } /** * 企业端-执法案件信息详情 - * @param dto + * @param bo * @return */ @ApiResponse(description = "企业端-执法案件信息详情") @GetMapping("/lawCasedetail") - public AppLawEnforcementCaseVo lawCasedetail(AppLawEnforcementCaseQueryDTO dto) { - return appLawEnforcementCaseService.selectAppLawEnforcementCaseById(dto); + public AppLawEnforcementCaseVo lawCasedetail(AppLawEnforcementCaseBo bo) { + return appLawEnforcementCaseService.selectAppLawEnforcementCaseById(bo); } /** * 企业端-执法信息详情 - * @param dto + * @param bo * @return */ @ApiResponse(description = "企业端-执法信息详情") @GetMapping("/lawDetail") - public AppEnforcementRegistrationVo lawDetail(AppLawEnforcementCaseQueryDTO dto) { - return appLawEnforcementCaseService.selectAppLawEnforcementLawDetailById(dto); + public AppEnforcementRegistrationVo lawDetail(AppLawEnforcementCaseBo bo) { + return appLawEnforcementCaseService.selectAppLawEnforcementLawDetailById(bo); } } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseComplaintController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseComplaintController.java index 6e2f1266..5232451a 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseComplaintController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseComplaintController.java @@ -1,7 +1,6 @@ package com.zdxt.enforcementcode.controller.app.enterprise; -import com.zdxt.enforcementcode.domain.dto.enterprise.AppEnterpriseComplatintInsertDTO; -import com.zdxt.enforcementcode.domain.dto.enterprise.AppEnterpriseComplatintQueryDTO; +import com.zdxt.enforcementcode.domain.bo.enterprise.AppEnterpriseComplaintBo; import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnterpriseComplaintVo; import com.zdxt.enforcementcode.service.enterprise.IAppEnterpriseComplaintService; import io.swagger.v3.oas.annotations.responses.ApiResponse; @@ -36,8 +35,8 @@ public class AppEnterpriseComplaintController extends BaseController { @ApiResponse(description = "新增投诉建议") @PostMapping("/add") @ResponseBody - public R addSave(@RequestBody AppEnterpriseComplatintInsertDTO dto) { - return toAjax(appEnterpriseComplaintService.insertEnterpriseComplaint(dto)); + public R addSave(@RequestBody AppEnterpriseComplaintBo bo) { + return toAjax(appEnterpriseComplaintService.insertEnterpriseComplaint(bo)); } @@ -48,8 +47,8 @@ public class AppEnterpriseComplaintController extends BaseController { */ @ApiResponse(description = "投诉建议列表") @GetMapping("/list") - public TableDataInfo list(@ModelAttribute AppEnterpriseComplatintQueryDTO dto, PageQuery pageQuery) { - TableDataInfo list = appEnterpriseComplaintService.queryPageList(dto, pageQuery); + public TableDataInfo list(@ModelAttribute AppEnterpriseComplaintBo bo, PageQuery pageQuery) { + TableDataInfo list = appEnterpriseComplaintService.queryPageList(bo, pageQuery); return list; } @@ -72,8 +71,8 @@ public class AppEnterpriseComplaintController extends BaseController { */ @ApiResponse(description = "投诉建议-行政和非行政未被投诉列表") @GetMapping("/listNotComplaint") - public TableDataInfo listNotComplaint(@ModelAttribute AppEnterpriseComplatintQueryDTO dto, PageQuery pageQuery) { - TableDataInfo list = appEnterpriseComplaintService.getAllCheckList(dto, pageQuery); + public TableDataInfo listNotComplaint(@ModelAttribute AppEnterpriseComplaintBo bo, PageQuery pageQuery) { + TableDataInfo list = appEnterpriseComplaintService.getAllCheckList(bo, pageQuery); return list; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseLoginController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseLoginController.java new file mode 100644 index 00000000..9c61ca5f --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseLoginController.java @@ -0,0 +1,43 @@ +package com.zdxt.enforcementcode.controller.app.enterprise; + + +import com.zdxt.enforcementcode.domain.bo.enterprise.AppEnterpriseLoginBo; +import com.zdxt.enforcementcode.service.enterprise.IAppEnterpriseLoginService; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; + +/** + * 企业端-用户登录 + */ +@Tag(name = "企业端-用户登录") +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/app-ent/login") +public class AppEnterpriseLoginController { + + + + @Autowired + private IAppEnterpriseLoginService appEnterpriseLoginService; + + /** + * 企业端用户登录 + */ + @ApiResponse(description = "企业端-用户登录") + @PostMapping("siqLogin") + @ResponseBody + public Boolean siqLogin(AppEnterpriseLoginBo bo){ + + Boolean flag = appEnterpriseLoginService.addSiqUser(bo); + + return flag; + } +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/enterprise/AppEnterpriseComplaintBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/enterprise/AppEnterpriseComplaintBo.java index 22a8b32b..ff728d26 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/enterprise/AppEnterpriseComplaintBo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/enterprise/AppEnterpriseComplaintBo.java @@ -1,5 +1,6 @@ package com.zdxt.enforcementcode.domain.bo.enterprise; +import com.baomidou.mybatisplus.annotation.TableField; import com.zdxt.enforcementcode.domain.EnterpriseComplaint; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -9,6 +10,7 @@ import org.dromara.common.core.validate.EditGroup; import org.dromara.common.mybatis.core.domain.BaseEntity; import java.util.Date; +import java.util.List; /** * 企业执法-在线投诉业务对象 enterprise_complaint @@ -147,5 +149,11 @@ public class AppEnterpriseComplaintBo extends BaseEntity { */ private Long recordType; + /** + * 文件列表- + */ + @TableField(exist = false) + private List fileList; + } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/enterprise/AppEnterpriseLoginBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/enterprise/AppEnterpriseLoginBo.java new file mode 100644 index 00000000..d2d8dd8c --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/enterprise/AppEnterpriseLoginBo.java @@ -0,0 +1,14 @@ +package com.zdxt.enforcementcode.domain.bo.enterprise; + + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; + +@Data +@JsonIgnoreProperties(ignoreUnknown = true) +public class AppEnterpriseLoginBo { + + private String userId; + private String userName; + private String code; +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/enterprise/AppLawEnforcementCaseQueryDTO.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/enterprise/AppLawEnforcementCaseBo.java similarity index 80% rename from zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/enterprise/AppLawEnforcementCaseQueryDTO.java rename to zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/enterprise/AppLawEnforcementCaseBo.java index dfe6086f..275964bd 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/enterprise/AppLawEnforcementCaseQueryDTO.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/enterprise/AppLawEnforcementCaseBo.java @@ -1,4 +1,4 @@ -package com.zdxt.enforcementcode.domain.dto.enterprise; +package com.zdxt.enforcementcode.domain.bo.enterprise; import lombok.Data; @@ -6,7 +6,7 @@ import lombok.Data; import java.util.Date; @Data -public class AppLawEnforcementCaseQueryDTO { +public class AppLawEnforcementCaseBo { /** * 主键ID diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/enterprise/AppEnterpriseComplatintInsertDTO.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/enterprise/AppEnterpriseComplatintInsertDTO.java deleted file mode 100644 index af8c5388..00000000 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/enterprise/AppEnterpriseComplatintInsertDTO.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.zdxt.enforcementcode.domain.dto.enterprise; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.zdxt.enforcementcode.domain.EnterpriseComplaint; -import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import lombok.Data; -import org.dromara.common.core.validate.EditGroup; - -import java.util.Date; -import java.util.List; - -@Data -@AutoMapper(target = EnterpriseComplaint.class) -public class AppEnterpriseComplatintInsertDTO { - - /** - * 主键ID - */ - @NotBlank(message = "主键ID不能为空", groups = { EditGroup.class }) - private String id; - - /** - * 关联执法记录ID - */ - private String relId; - - /** - * 执法类型 - */ - private Long enforceType; - - /** - * 问题描述 - */ - private String problemDescription; - - /** - * 联系人 - */ - private String linkman; - - /** - * 联系方式 - */ - private String linkmanTel; - - /** - * 是否删除 0 否 1 是 - */ - private Long isDelete; - - /** - * 投诉对接12345案件类型 - */ - private String caseType; - - /** - * - */ - private Long authorization; - - /** - * - */ - private Long comOrOpi; - - /** - * - */ - private String enterpriseAddress; - - /** - * - */ - private String proWoCode; - - /** - * - */ - private Long status; - - /** - * - */ - private Date evaluateTime; - - /** - * - */ - private String enterpriseNumber; - - /** - * - */ - private String enterpriseName; - - /** - * 执法部门多个-逗号隔开 - */ - private String complaintDepartments; - - /** - * 执法部门id多个-逗号隔开 - */ - private String complaintDepartmentIds; - - /** - * 执法时间 - */ - private Date enforcementTime; - - /** - * 投诉类型 0 系默认 1 联合检查 - */ - private Long complaintType; - - /** - * 投诉事项编码，多个逗号隔开 - */ - private String complaintItemCodes; - - /** - * 投诉事项名称，多个逗号隔开 - */ - private String complaintItemNames; - - /** - * 同步过来的处理时间 - */ - private String handleTime; - - /** - * 投诉事项（对应记录表执法/入企事项） - */ - private String complaintRecordItem; - - /** - * 数据类型 0行政 1 非行政 - */ - private Integer recordType; - - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 文件列表- - */ - @TableField(exist = false) - private List fileList; -} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/enterprise/AppEnterpriseComplatintQueryDTO.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/enterprise/AppEnterpriseComplatintQueryDTO.java deleted file mode 100644 index 72b117c7..00000000 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/enterprise/AppEnterpriseComplatintQueryDTO.java +++ /dev/null @@ -1,156 +0,0 @@ -package com.zdxt.enforcementcode.domain.dto.enterprise; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.zdxt.enforcementcode.domain.EnterpriseComplaint; -import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; - -import java.util.Date; -import java.util.List; - -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = EnterpriseComplaint.class) -public class AppEnterpriseComplatintQueryDTO extends BaseEntity { - /** - * 主键ID - */ - @NotBlank(message = "主键ID不能为空", groups = { EditGroup.class }) - private String id; - - /** - * 关联执法记录ID - */ - private String relId; - - /** - * 执法类型 - */ - private Long enforceType; - - /** - * 问题描述 - */ - private String problemDescription; - - /** - * 联系人 - */ - private String linkman; - - /** - * 联系方式 - */ - private String linkmanTel; - - /** - * 是否删除 0 否 1 是 - */ - private Long isDelete; - - /** - * 投诉对接12345案件类型 - */ - private String caseType; - - /** - * - */ - private Long authorization; - - /** - * - */ - private Long comOrOpi; - - /** - * - */ - private String enterpriseAddress; - - /** - * - */ - private String proWoCode; - - /** - * - */ - private Long status; - - /** - * - */ - private Date evaluateTime; - - /** - * - */ - private String enterpriseNumber; - - /** - * - */ - private String enterpriseName; - - /** - * 执法部门多个-逗号隔开 - */ - private String complaintDepartments; - - /** - * 执法部门id多个-逗号隔开 - */ - private String complaintDepartmentIds; - - /** - * 执法时间 - */ - private Date enforcementTime; - - /** - * 投诉类型 0 系默认 1 联合检查 - */ - private Long complaintType; - - /** - * 投诉事项编码，多个逗号隔开 - */ - private String complaintItemCodes; - - /** - * 投诉事项名称，多个逗号隔开 - */ - private String complaintItemNames; - - /** - * 同步过来的处理时间 - */ - private String handleTime; - - /** - * 投诉事项（对应记录表执法/入企事项） - */ - private String complaintRecordItem; - - /** - * 数据类型 0行政 1 非行政 - */ - private Integer recordType; - - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 文件列表- - */ - @TableField(exist = false) - private List fileList; -} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/enterprise/EnforcementRegistrationQueryDTO.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/enterprise/EnforcementRegistrationQueryDTO.java deleted file mode 100644 index 43a89801..00000000 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/dto/enterprise/EnforcementRegistrationQueryDTO.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.zdxt.enforcementcode.domain.dto.enterprise; - - - -import lombok.Data; - - -/** - * 企业端-查询企业执法登记列表 - * - * @author Lion Li - * @date 2026-04-17 - */ -@Data -public class EnforcementRegistrationQueryDTO { - - /** - * 执法部门 - */ - private String lawEnforcement; - - - /** - * 执法事项 - */ - private String lawEnforcementItem; - - /** - * 是否真联合执法(0:未联合; 1:已经联合) - */ - private Long isRealUnion; - - /** - * 查询字段 - */ - private String searchValue; - - /** - * 日期类型筛选: 1=本月, 2=本季, 3=本年 - */ - private Integer dateType; - - - - private String dateSearch; - /** - * 年 - */ - private String year; - /** - * 季度 - */ - private String quarter; - /** - * 日 - */ - private String month; - - /** - * 开始时间 - */ - private String beginTime; - private String beginEnforcementTime; - - /** - * 结束时间 - */ - private String endTime; - private String endEnforcementTime; - - - /** - * 关键字查询 - */ - private String searchText; -} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementRegistrationMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementRegistrationMapper.java index 2b68b09a..5dec3d7d 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementRegistrationMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementRegistrationMapper.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zdxt.enforcementcode.domain.EnforcementRegistration; -import com.zdxt.enforcementcode.domain.dto.enterprise.EnforcementRegistrationQueryDTO; +import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; import com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationListVo; import org.apache.ibatis.annotations.Param; @@ -26,6 +26,6 @@ public interface EnforcementRegistrationMapper extends BaseMapperPlus selectEnforcementRegistrationPage(@Param("page") Page page, @Param("dto") EnforcementRegistrationQueryDTO dto); + IPage selectEnforcementRegistrationPage(@Param("page") Page page, @Param("bo") EnforcementRegistrationBo dto); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/enterprise/AppEnforcementRegistrationMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/enterprise/AppEnforcementRegistrationMapper.java index 356efa8f..6bf8aea3 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/enterprise/AppEnforcementRegistrationMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/enterprise/AppEnforcementRegistrationMapper.java @@ -3,7 +3,7 @@ package com.zdxt.enforcementcode.mapper.enterprise; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zdxt.enforcementcode.domain.EnforcementRegistration; -import com.zdxt.enforcementcode.domain.dto.enterprise.EnforcementRegistrationQueryDTO; +import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnforcementRegistrationVo; import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -13,9 +13,9 @@ public interface AppEnforcementRegistrationMapper extends BaseMapperPlus selectEnforcementRegistrationPage(@Param("page") Page page, @Param("dto") EnforcementRegistrationQueryDTO dto); + IPage selectEnforcementRegistrationPage(@Param("page") Page page, @Param("bo") EnforcementRegistrationBo bo); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/enterprise/AppLawEnforcementCaseMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/enterprise/AppLawEnforcementCaseMapper.java index 13158183..d868397a 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/enterprise/AppLawEnforcementCaseMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/enterprise/AppLawEnforcementCaseMapper.java @@ -2,7 +2,7 @@ package com.zdxt.enforcementcode.mapper.enterprise; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.zdxt.enforcementcode.domain.dto.enterprise.AppLawEnforcementCaseQueryDTO; +import com.zdxt.enforcementcode.domain.bo.enterprise.AppLawEnforcementCaseBo; import com.zdxt.enforcementcode.domain.vo.enterprise.AppLawEnforcementCaseVo; import org.apache.ibatis.annotations.Param; @@ -18,7 +18,7 @@ public interface AppLawEnforcementCaseMapper { * @param page 分页参数 * @return 企业端-执法案件列表 */ - IPage selectAppLawEnforcementCaseList(@Param("dto") AppLawEnforcementCaseQueryDTO dto, @Param("page") Page page); + IPage selectAppLawEnforcementCaseList(@Param("bo") AppLawEnforcementCaseBo bo, @Param("page") Page page); /** * 查询企业端-行政检查案件详情 diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementRegistrationService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementRegistrationService.java index 63a56512..d8a8cf4b 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementRegistrationService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnforcementRegistrationService.java @@ -1,11 +1,9 @@ package com.zdxt.enforcementcode.service; -import com.zdxt.enforcementcode.domain.dto.enterprise.EnforcementRegistrationQueryDTO; -import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; +import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; import com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationDetailVo; import com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationListVo; -import org.dromara.common.core.domain.R; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; import org.springframework.web.bind.annotation.PathVariable; @@ -36,7 +34,7 @@ public interface IEnforcementRegistrationService { * @param pageQuery 分页参数 * @return 企业端-执法登记记录分页列表 */ - TableDataInfo queryPageList(EnforcementRegistrationBo bo, PageQuery pageQuery); + TableDataInfo queryPageList(com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo bo, PageQuery pageQuery); /** * 企业端-分页查询执法登记记录列表（含投诉标记、字典翻译、超时计算等） @@ -45,7 +43,7 @@ public interface IEnforcementRegistrationService { * @param pageQuery 分页参数 * @return 企业端-执法登记记录分页列表 */ - TableDataInfo queryEnterprisePageList(EnforcementRegistrationBo bo, PageQuery pageQuery); + TableDataInfo queryEnterprisePageList(com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo bo, PageQuery pageQuery); /** * 查询符合条件的企业端-执法登记记录列表 @@ -53,7 +51,7 @@ public interface IEnforcementRegistrationService { * @param bo 查询条件 * @return 企业端-执法登记记录列表 */ - List queryList(EnforcementRegistrationBo bo); + List queryList(com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo bo); /** * 新增企业端-执法登记记录 @@ -61,7 +59,7 @@ public interface IEnforcementRegistrationService { * @param bo 企业端-执法登记记录 * @return 是否新增成功 */ - Boolean insertByBo(EnforcementRegistrationBo bo); + Boolean insertByBo(com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo bo); /** * 修改企业端-执法登记记录 @@ -69,7 +67,7 @@ public interface IEnforcementRegistrationService { * @param bo 企业端-执法登记记录 * @return 是否修改成功 */ - Boolean updateByBo(EnforcementRegistrationBo bo); + Boolean updateByBo(com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo bo); /** * 校验并批量删除企业端-执法登记记录信息 @@ -83,11 +81,11 @@ public interface IEnforcementRegistrationService { /** * 企业端-执法登记列表（历史执法信息） - * @param dto + * @param bo * @param pageQuery * @return */ - TableDataInfo queryEnforcementRegistrationPageList(EnforcementRegistrationQueryDTO dto, PageQuery pageQuery); + TableDataInfo queryEnforcementRegistrationPageList(EnforcementRegistrationBo bo, PageQuery pageQuery); /** * 企业端-执法登记详情 diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/IAppEnterpriseComplaintService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/IAppEnterpriseComplaintService.java index 21303059..8583adce 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/IAppEnterpriseComplaintService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/IAppEnterpriseComplaintService.java @@ -1,8 +1,7 @@ package com.zdxt.enforcementcode.service.enterprise; import com.zdxt.enforcementcode.domain.bo.EnterpriseComplaintBo; -import com.zdxt.enforcementcode.domain.dto.enterprise.AppEnterpriseComplatintInsertDTO; -import com.zdxt.enforcementcode.domain.dto.enterprise.AppEnterpriseComplatintQueryDTO; +import com.zdxt.enforcementcode.domain.bo.enterprise.AppEnterpriseComplaintBo; import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnterpriseComplaintVo; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; @@ -24,20 +23,20 @@ public interface IAppEnterpriseComplaintService { /** * 分页查询企业执法-在线投诉列表 * - * @param dto 查询条件 + * @param bo 查询条件 * @param pageQuery 分页参数 * @return 企业执法-在线投诉分页列表 */ - TableDataInfo queryPageList(AppEnterpriseComplatintQueryDTO dto, PageQuery pageQuery); + TableDataInfo queryPageList(AppEnterpriseComplaintBo bo, PageQuery pageQuery); /** * 新增企业执法-在线投诉 * - * @param dto 企业执法-在线投诉 + * @param bo 企业执法-在线投诉 * @return 是否新增成功 */ - Boolean insertEnterpriseComplaint(AppEnterpriseComplatintInsertDTO dto); + Boolean insertEnterpriseComplaint(AppEnterpriseComplaintBo bo); /** * 修改企业执法-在线投诉 @@ -61,5 +60,5 @@ public interface IAppEnterpriseComplaintService { * @param pageQuery * @return */ - TableDataInfo getAllCheckList(AppEnterpriseComplatintQueryDTO dto,PageQuery pageQuery); + TableDataInfo getAllCheckList(AppEnterpriseComplaintBo bo,PageQuery pageQuery); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/IAppEnterpriseLoginService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/IAppEnterpriseLoginService.java new file mode 100644 index 00000000..4b9a179a --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/IAppEnterpriseLoginService.java @@ -0,0 +1,15 @@ +package com.zdxt.enforcementcode.service.enterprise; + +import com.alibaba.fastjson.JSONObject; +import com.zdxt.enforcementcode.domain.bo.enterprise.AppEnterpriseLoginBo; +import org.dromara.system.domain.vo.SysUserVo; + + +/** + * 企业端-企业用户登录Service接口 + */ +public interface IAppEnterpriseLoginService { + + + Boolean addSiqUser(AppEnterpriseLoginBo bo); +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/IAppLawEnforcementCaseService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/IAppLawEnforcementCaseService.java index a64fde5d..0cbf718d 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/IAppLawEnforcementCaseService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/IAppLawEnforcementCaseService.java @@ -1,6 +1,6 @@ package com.zdxt.enforcementcode.service.enterprise; -import com.zdxt.enforcementcode.domain.dto.enterprise.AppLawEnforcementCaseQueryDTO; +import com.zdxt.enforcementcode.domain.bo.enterprise.AppLawEnforcementCaseBo; import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnforcementRegistrationVo; import com.zdxt.enforcementcode.domain.vo.enterprise.AppLawEnforcementCaseVo; import org.dromara.common.mybatis.core.page.PageQuery; @@ -10,23 +10,23 @@ public interface IAppLawEnforcementCaseService { /** * 企业端-执法案件列表 - * @param queryDTO + * @param bo * @param pageQuery * @return */ - TableDataInfo selectAppLawEnforcementCaseList(AppLawEnforcementCaseQueryDTO queryDTO, PageQuery pageQuery); + TableDataInfo selectAppLawEnforcementCaseList(AppLawEnforcementCaseBo bo, PageQuery pageQuery); /** * 企业端-执法案件详情 - * @param dto + * @param bo * @return */ - AppLawEnforcementCaseVo selectAppLawEnforcementCaseById(AppLawEnforcementCaseQueryDTO dto); + AppLawEnforcementCaseVo selectAppLawEnforcementCaseById(AppLawEnforcementCaseBo bo); /** * 企业端-执法信息详情 - * @param dto + * @param bo * @return */ - AppEnforcementRegistrationVo selectAppLawEnforcementLawDetailById(AppLawEnforcementCaseQueryDTO dto); + AppEnforcementRegistrationVo selectAppLawEnforcementLawDetailById(AppLawEnforcementCaseBo bo); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseComplaintServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseComplaintServiceImpl.java index 708aa6e9..5c5beada 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseComplaintServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseComplaintServiceImpl.java @@ -11,8 +11,7 @@ import com.zdxt.enforcementcode.domain.NonEnforcementRegistration; import com.zdxt.enforcementcode.domain.ZdxtFile; import com.zdxt.enforcementcode.domain.bo.EnterpriseComplaintBo; import com.zdxt.enforcementcode.common.commonenum.AppEnterpriseComplaintEnums; -import com.zdxt.enforcementcode.domain.dto.enterprise.AppEnterpriseComplatintInsertDTO; -import com.zdxt.enforcementcode.domain.dto.enterprise.AppEnterpriseComplatintQueryDTO; +import com.zdxt.enforcementcode.domain.bo.enterprise.AppEnterpriseComplaintBo; import com.zdxt.enforcementcode.domain.vo.ZdxtFileVo; import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnterpriseComplaintVo; import com.zdxt.enforcementcode.mapper.ZdxtFileMapper; @@ -74,14 +73,14 @@ public class AppEnterpriseComplaintServiceImpl implements IAppEnterpriseComplain /** * 分页查询企业执法-在线投诉列表 * - * @param dto 查询条件 + * @param bo 查询条件 * @param pageQuery 分页参数 * @return 企业执法-在线投诉分页列表 */ @Override - public TableDataInfo queryPageList(AppEnterpriseComplatintQueryDTO dto, PageQuery pageQuery) { + public TableDataInfo queryPageList(AppEnterpriseComplaintBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(dto.getRelId()), EnterpriseComplaint::getRelId, dto.getRelId()); + lqw.eq(StringUtils.isNotBlank(bo.getRelId()), EnterpriseComplaint::getRelId, bo.getRelId()); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); return TableDataInfo.build(result); } @@ -89,30 +88,30 @@ public class AppEnterpriseComplaintServiceImpl implements IAppEnterpriseComplain /** * 新增企业执法-在线投诉 * - * @param dto 企业执法-在线投诉 + * @param bo 企业执法-在线投诉 * @return 是否新增成功 */ @Override @Transactional - public Boolean insertEnterpriseComplaint(AppEnterpriseComplatintInsertDTO dto) { + public Boolean insertEnterpriseComplaint(AppEnterpriseComplaintBo bo) { - dto.setCreateTime(DateUtils.getNowDate()); - dto.setId(IdUtil.simpleUUID()); - EnterpriseComplaint add = MapstructUtils.convert(dto, EnterpriseComplaint.class); + bo.setCreateTime(DateUtils.getNowDate()); + bo.setId(IdUtil.simpleUUID()); + EnterpriseComplaint add = MapstructUtils.convert(bo, EnterpriseComplaint.class); // 保存投诉信息 boolean flag = baseMapper.insert(add) > 0; if (flag) { //更新记录表状态 0：行政 1非行政 - if(AppEnterpriseComplaintEnums.ADMINISTRATION.getKey().equals(dto.getRecordType())){ + if(AppEnterpriseComplaintEnums.ADMINISTRATION.getKey().equals(bo.getRecordType())){ EnforcementRegistration param =new EnforcementRegistration(); - param.setId(dto.getRelId()); + param.setId(bo.getRelId()); param.setIsComplaint(AppEnterpriseComplaintEnums.IS_COMPLAINT.getKey()); // 更新执法登记记录 enforcementRegistrationMapper.updateById(param); }else{ NonEnforcementRegistration param =new NonEnforcementRegistration(); - param.setId(dto.getRelId()); + param.setId(bo.getRelId()); param.setHasComplaint(AppEnterpriseComplaintEnums.IS_COMPLAINT.getKey()); // 更新非执法登记记录 nonEnforcementRegistrationMapper.updateById(param); @@ -121,10 +120,10 @@ public class AppEnterpriseComplaintServiceImpl implements IAppEnterpriseComplain //原逻辑这边会调用创建民生诉求工单,接口会做后续安排 //上传附件文件 - if(dto.getFileList() != null && !dto.getFileList().isEmpty()){ - dto.getFileList().forEach(file -> { + if(bo.getFileList() != null && !bo.getFileList().isEmpty()){ + bo.getFileList().forEach(file -> { ZdxtFile zdxtFile = new ZdxtFile(); - zdxtFile.setBusinessId(dto.getId()); + zdxtFile.setBusinessId(bo.getId()); zdxtFile.setGuid(IdUtil.simpleUUID()); zdxtFile.setFileSuffix(AppEnterpriseComplaintEnums.JPG.getValue()); zdxtFile.setUploadPath(file); @@ -176,40 +175,40 @@ public class AppEnterpriseComplaintServiceImpl implements IAppEnterpriseComplain /** * 企业端-投诉建议查询行政和非行政未被投诉列表 - * @param dto 查询条件 + * @param bo 查询条件 * @param pageQuery 分页参数 * @return 投诉建议列表 */ @Override - public TableDataInfo getAllCheckList(AppEnterpriseComplatintQueryDTO dto, PageQuery pageQuery) { + public TableDataInfo getAllCheckList(AppEnterpriseComplaintBo bo, PageQuery pageQuery) { // 构建查询条件 LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); // 根据 relId 过滤 - lqw.eq(StringUtils.isNotBlank(dto.getRelId()), EnterpriseComplaint::getRelId, dto.getRelId()); + lqw.eq(StringUtils.isNotBlank(bo.getRelId()), EnterpriseComplaint::getRelId, bo.getRelId()); // 根据搜索值模糊查询（问题描述、联系人、企业名称等） - if (StringUtils.isNotBlank(dto.getSearchValue())) { + if (StringUtils.isNotBlank(bo.getSearchValue())) { lqw.and(wrapper -> wrapper - .like(EnterpriseComplaint::getProblemDescription, dto.getSearchValue()) + .like(EnterpriseComplaint::getProblemDescription, bo.getSearchValue()) .or() - .like(EnterpriseComplaint::getLinkman, dto.getSearchValue()) + .like(EnterpriseComplaint::getLinkman, bo.getSearchValue()) .or() - .like(EnterpriseComplaint::getEnterpriseName, dto.getSearchValue()) + .like(EnterpriseComplaint::getEnterpriseName, bo.getSearchValue()) ); } // 根据执法类型过滤 - lqw.eq(dto.getEnforceType() != null, EnterpriseComplaint::getEnforceType, dto.getEnforceType()); + lqw.eq(bo.getEnforceType() != null, EnterpriseComplaint::getEnforceType, bo.getEnforceType()); // 根据投诉类型过滤 - lqw.eq(dto.getComplaintType() != null, EnterpriseComplaint::getComplaintType, dto.getComplaintType()); + lqw.eq(bo.getComplaintType() != null, EnterpriseComplaint::getComplaintType, bo.getComplaintType()); // 根据数据类型过滤（0行政 1非行政） - lqw.eq(dto.getRecordType() != null, EnterpriseComplaint::getRecordType, dto.getRecordType()); + lqw.eq(bo.getRecordType() != null, EnterpriseComplaint::getRecordType, bo.getRecordType()); // 根据状态过滤 - lqw.eq(dto.getStatus() != null, EnterpriseComplaint::getStatus, dto.getStatus()); + lqw.eq(bo.getStatus() != null, EnterpriseComplaint::getStatus, bo.getStatus()); // 按创建时间降序排列 lqw.orderByDesc(EnterpriseComplaint::getCreateTime); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java new file mode 100644 index 00000000..74abde73 --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java @@ -0,0 +1,321 @@ +package com.zdxt.enforcementcode.service.enterprise.impl; + + +import cn.hutool.core.util.ArrayUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.crypto.digest.DigestUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zdxt.enforcementcode.common.util.ApiConstants; +import com.zdxt.enforcementcode.common.util.HttpUtil; +import com.zdxt.enforcementcode.common.util.IdCardCryptoUtil; +import com.zdxt.enforcementcode.common.util.UserConstants; +import com.zdxt.enforcementcode.domain.EnterpriseInformation; +import com.zdxt.enforcementcode.domain.bo.enterprise.AppEnterpriseLoginBo; +import com.zdxt.enforcementcode.mapper.EnterpriseInformationMapper; +import com.zdxt.enforcementcode.service.enterprise.IAppEnterpriseLoginService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.utils.DateUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.system.domain.SysUser; +import org.dromara.system.domain.SysUserPost; +import org.dromara.system.domain.SysUserRole; +import org.dromara.system.domain.vo.SysUserVo; +import org.dromara.system.mapper.SysUserMapper; +import org.dromara.system.mapper.SysUserPostMapper; +import org.dromara.system.mapper.SysUserRoleMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.*; + + +/** + * 企业端-登录Service业务层处理 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class AppEnterpriseLoginServiceImpl implements IAppEnterpriseLoginService { + + @Value("${siq.code}") + private String code; + @Value("${siq.secretKey}") + private String secretKey; + @Value("${siq.siqUrl}") + private String siqUrl; + + + @Autowired + private SysUserMapper sysUserMapper; + + @Autowired + private SysUserPostMapper sysUserPostMapper; + + @Autowired + private SysUserRoleMapper sysUserRoleMapper; + + @Autowired + private EnterpriseInformationMapper enterpriseInformationMapper; + + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + @Override + public Boolean addSiqUser(AppEnterpriseLoginBo bo) { + + //调用深i企登录接口 + JSONObject userInfo =siqLoginInfo(bo); + //判断用户信息 + Map checkUserInfo = checkUserInfo(userInfo); + if (UserConstants.USER_NAME_NOT_UNIQUE.equals(checkUserInfo.get("unique"))) { + return false; + } + if (checkUserInfo.get("userId") != null) { + return false; + } + //封装添加用户信息 + String phone =checkUserInfo.get("phone").toString(); + SysUser sysUser = addUserInfo(userInfo, phone ); + //用户密码加密 + Boolean result=false; + result =encryptPassword(sysUser); + //添加深i企用户关联企业信息 + if (result == true) { + result= addSiqUserCompany(userInfo); + } + // 用户登录-需要生成Token （暂时搁置） + return result; + } + + /** + * 调用深i企登录接口返回用户登录信息 + */ + + public JSONObject siqLoginInfo(AppEnterpriseLoginBo bo){ + + Map params = new HashMap<>(); + + String accessKeySign = IdCardCryptoUtil.symmetricEncryptIdCard(secretKey,bo.getCode()); + params.put("accessKeySign",accessKeySign); + params.put("accessKeySign{}",accessKeySign); + params.put("appCode",code); + + String data = HttpUtil.httpSendPost(siqUrl + ApiConstants.API_SIQUSERLOGIN, JSONObject.toJSONString(params),new HashMap<>()); + JSONObject jsonObject = JSONObject.parseObject(data); + JSONObject userInfo = jsonObject.getJSONObject("data"); + + return userInfo; + } + + /** + * 判断用户登录信息 + */ + public Map checkUserInfo(JSONObject userInfo) { + + Map map = new HashMap<>(); + // 判断用户唯一校验 + String userUnique; + LambdaQueryWrapper queryAccountWrapper = new LambdaQueryWrapper<>(); + queryAccountWrapper.eq(SysUser::getLoginName, userInfo.getString("account")) + .eq(SysUser::getUserSource, UserConstants.DEFAULT_USER_SOURCE); + userUnique = String.valueOf(sysUserMapper.selectCount(queryAccountWrapper)); + + if (UserConstants.USER_NAME_NOT_UNIQUE.equals(userUnique)) { + map.put("unique", UserConstants.USER_NAME_NOT_UNIQUE); + return map; + } + + LambdaQueryWrapper queryPhoneWrapper = new LambdaQueryWrapper<>(); + queryPhoneWrapper.eq(SysUser::getLoginName, userInfo.getString("phone")) + .eq(SysUser::getUserSource, UserConstants.DEFAULT_USER_SOURCE); + userUnique = String.valueOf(sysUserMapper.selectCount(queryPhoneWrapper)); + + if (UserConstants.USER_NAME_NOT_UNIQUE.equals(userUnique)) { + map.put("unique", UserConstants.USER_NAME_NOT_UNIQUE); + return map; + } + + // 判断用户名是否重复 + String phone = IdCardCryptoUtil.symmetricDecryptIdCard(secretKey, userInfo.getString("phone")); + LambdaQueryWrapper queryLoginNameWrapper = new LambdaQueryWrapper<>(); + queryLoginNameWrapper.eq(SysUser::getLoginName, phone) + .eq(SysUser::getUserSource, UserConstants.DEFAULT_USER_SOURCE); + SysUser sysUser = sysUserMapper.selectOne(queryLoginNameWrapper); + if (sysUser != null && sysUser.getUserId() != null) { + map.put("userId", sysUser.getUserId()); + map.put("phone", phone); + return map; + } + return map; + } + + + /** + * 封装添加用户信息 + */ + public SysUser addUserInfo(JSONObject userInfo,String phone) { + + //新增用户信息 + SysUser user = new SysUser(); + if (StringUtils.isNotEmpty(userInfo.getString("account"))) { + + // 设置默认用户权限，权限默认值 + user.setRoleId(UserConstants.DEFAULT_ROLE); + user.setUserName(userInfo.getString("userName")); + if (StringUtils.isNotEmpty(userInfo.getString("account"))) { + user.setLoginName(userInfo.getString("account")); + } else { + user.setLoginName(phone); + } + user.setPhonenumber(phone); + // 设置默认密码 + user.setPassword(UserConstants.DEFAULT_PASSWORD); + user.setCreateTime(DateUtils.getNowDate()); + // 设置默认部门ID + user.setDeptId(UserConstants.DEFAULT_DEPT); + // 设置用户类型 + user.setUserSource(UserConstants.DEFAULT_USER_SOURCE); + user.setDelFlag(UserConstants.NORMAL_DEL_FLAG); + + }else if(StringUtils.isNotEmpty(userInfo.getString("phone"))){ + // 设置默认用户权限，权限默认值 + user.setRoleId(UserConstants.DEFAULT_ROLE); + user.setUserName(userInfo.getString("userName")); + if (StringUtils.isNotEmpty(userInfo.getString("account"))) { + user.setLoginName(userInfo.getString("account")); + } else { + user.setLoginName(phone); + } + user.setPhonenumber(phone); + // 设置默认密码 + user.setPassword(UserConstants.DEFAULT_PASSWORD); + user.setCreateTime(DateUtils.getNowDate()); + // 设置默认部门ID + user.setDeptId(UserConstants.DEFAULT_DEPT); + // 设置用户类型 + user.setUserSource(UserConstants.DEFAULT_USER_SOURCE); + user.setDelFlag(UserConstants.NORMAL_DEL_FLAG); + } + return user ; + } + + /** + * 用户密码加密 + */ + public Boolean encryptPassword(SysUser user) { + // 用户密码加密 + user.setPassword(DigestUtil.md5Hex(user.getLoginName()+user.getPassword()+user.getSalt())); + // 新增用户 + int rows = 0; + Boolean flag=false; + rows= sysUserMapper.insert(user); + // 新增岗位 + if (ArrayUtil.isNotEmpty(user.getPostIds())) { + List userPostList = new ArrayList<>(); + for (Long postId : user.getPostIds()) { + SysUserPost userPost = new SysUserPost(); + userPost.setUserId(user.getUserId()); + userPost.setPostId(postId); + userPostList.add(userPost); + } + flag= sysUserPostMapper.insertBatch(userPostList); + } + // 新增用户与角色管理 + if (ArrayUtil.isNotEmpty(user.getRoleId())) { + List userRoleList = new ArrayList<>(); + for (Long roleId : user.getRoleIds()) { + SysUserRole userPost = new SysUserRole(); + userPost.setUserId(user.getUserId()); + userPost.setRoleId(roleId); + userRoleList.add(userPost); + } + flag=sysUserRoleMapper.insertBatch(userRoleList); + } + + if (rows==1 && flag==true) { + return true; + }else{ + return false; + } + } + + + // 添加深i企用户关联企业信息 + /** + * 添加深i企用户关联企业信息 + */ + public Boolean addSiqUserCompany(JSONObject userInfo){ + + EnterpriseInformation enterpriseInformation = new EnterpriseInformation(); + // 企业纳税识别号 + enterpriseInformation.setEnterpriseNumber(userInfo.getString("corpCid")); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(EnterpriseInformation::getEnterpriseNumber, enterpriseInformation.getEnterpriseNumber()); + if (enterpriseInformationMapper.selectCount(queryWrapper) > 0) { + return false; + } + //企业名称 + enterpriseInformation.setEnterpriseName(userInfo.getString("corpName")); + //企业类型 + enterpriseInformation.setCompanyOrgType(userInfo.getString("companyOrgType")); + //注册时间 + String establishDate = userInfo.getString("establishDate"); + try { + if (StrUtil.isNotEmpty(establishDate)) { + Date establishDateD = format.parse(establishDate); + enterpriseInformation.setEstablishmentTime(establishDateD); + } + } catch (Exception e) { + log.warn("解析企业成立日期失败: {}", establishDate, e); + } + //经营范围 + enterpriseInformation.setBusinessScope(userInfo.getString("businessScope")); + //注册地址 + enterpriseInformation.setEnterpriseAddress(userInfo.getString("regLocation")); + //注册资金 + enterpriseInformation.setRegisteredCapital(userInfo.getString("regCapital")); + //企业联系人电话 + enterpriseInformation.setEnterpriseTel(IdCardCryptoUtil.symmetricDecryptIdCard(secretKey,userInfo.getString("phone"))); + //企业法人 + enterpriseInformation.setLegalPerson(userInfo.getString("legalPersonName")); + //用户Id + enterpriseInformation.setUserId(Long.valueOf(userInfo.getString("userId"))); + //营业时间 + //开始时间 + String termStart = userInfo.getString("termStart"); + try { + Date termStartD = format.parse(termStart); + termStart = format.format(termStartD); + } catch (Exception e) { + termStart = ""; + } + //结束时间 返回为空表示为永久 + String termEnd = userInfo.getString("termEnd"); + try { + if(StrUtil.isNotEmpty(termEnd)){ + Date termEndD = format.parse(termEnd); + termEnd = format.format(termEndD); + } + } catch (Exception e) { + termEnd = ""; + } + //营业期限-开始时间 + enterpriseInformation.setOperatingTerm(termStart); + //营业期限-结束时间 为空表示 无固定期限 + enterpriseInformation.setOperatingTermEnd(termEnd); + + return enterpriseInformationMapper.insert(enterpriseInformation)>0? Boolean.TRUE:Boolean.FALSE; + + } + // 深i企用户登录 + public SysUserVo siqLogin(JSONObject userInfo){ + + SysUserVo sysUserVo = new SysUserVo(); + + + return sysUserVo; + } + +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppLawEnforcementCaseServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppLawEnforcementCaseServiceImpl.java index b90aac9f..b440ff1d 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppLawEnforcementCaseServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppLawEnforcementCaseServiceImpl.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zdxt.enforcementcode.common.commonenum.LawTypeEnum; import com.zdxt.enforcementcode.domain.EnforcementRegistration; import com.zdxt.enforcementcode.domain.ZdxtFile; -import com.zdxt.enforcementcode.domain.dto.enterprise.AppLawEnforcementCaseQueryDTO; +import com.zdxt.enforcementcode.domain.bo.enterprise.AppLawEnforcementCaseBo; import com.zdxt.enforcementcode.domain.vo.enterprise.AppEnforcementRegistrationVo; import com.zdxt.enforcementcode.domain.vo.enterprise.AppLawEnforcementCaseVo; import com.zdxt.enforcementcode.mapper.ZdxtFileMapper; @@ -33,45 +33,45 @@ public class AppLawEnforcementCaseServiceImpl implements IAppLawEnforcementCaseS /** * 企业端-查询案件列表 - * @param queryDTO + * @param bo * @param pageQuery * @return */ @Override - public TableDataInfo selectAppLawEnforcementCaseList(AppLawEnforcementCaseQueryDTO queryDTO, PageQuery pageQuery) { + public TableDataInfo selectAppLawEnforcementCaseList(AppLawEnforcementCaseBo bo, PageQuery pageQuery) { Page page = pageQuery.build(); - IPage result = appLawEnforcementCaseMapper.selectAppLawEnforcementCaseList(queryDTO, page); + IPage result = appLawEnforcementCaseMapper.selectAppLawEnforcementCaseList(bo, page); return TableDataInfo.build(result); } /** * 企业端-查询案件详情 - * @param dto + * @param bo * @return */ @Override - public AppLawEnforcementCaseVo selectAppLawEnforcementCaseById(AppLawEnforcementCaseQueryDTO dto) { - Integer type = dto.getLawEnforcementType(); + public AppLawEnforcementCaseVo selectAppLawEnforcementCaseById(AppLawEnforcementCaseBo bo) { + Integer type = bo.getLawEnforcementType(); if (LawTypeEnum.ADMIN_CHECK.getKey().equals(type)) { - return appLawEnforcementCaseMapper.selectAppLawEnforcementCaseCheckById(dto.getId()); + return appLawEnforcementCaseMapper.selectAppLawEnforcementCaseCheckById(bo.getId()); } else if (LawTypeEnum.ADMIN_PUNISH.getKey().equals(type)) { - return appLawEnforcementCaseMapper.selectAppLawEnforcementCasePunishmentById(dto.getId()); + return appLawEnforcementCaseMapper.selectAppLawEnforcementCasePunishmentById(bo.getId()); } else { - return appLawEnforcementCaseMapper.selectAppLawEnforcementCaseCompulsoryById(dto.getId()); + return appLawEnforcementCaseMapper.selectAppLawEnforcementCaseCompulsoryById(bo.getId()); } } /** * 企业端-查询案执法信息详情 - * @param dto + * @param bo * @return */ @Override - public AppEnforcementRegistrationVo selectAppLawEnforcementLawDetailById(AppLawEnforcementCaseQueryDTO dto) { + public AppEnforcementRegistrationVo selectAppLawEnforcementLawDetailById(AppLawEnforcementCaseBo bo) { // 1. 查询执法登记主信息 LambdaQueryWrapper lqw = new LambdaQueryWrapper() - .eq(EnforcementRegistration::getLawCaseId, dto.getId()) - .eq(EnforcementRegistration::getLawEnforceCategory, dto.getLawEnforcementType()); + .eq(EnforcementRegistration::getLawCaseId, bo.getId()) + .eq(EnforcementRegistration::getLawEnforceCategory, bo.getLawEnforcementType()); AppEnforcementRegistrationVo vo = appEnforcementRegistrationMapper.selectVoOne(lqw); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java index 65ee514f..7f79e337 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java @@ -5,7 +5,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zdxt.enforcementcode.domain.EnterpriseEvaluate; -import com.zdxt.enforcementcode.domain.dto.enterprise.EnforcementRegistrationQueryDTO; +import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; import com.zdxt.enforcementcode.domain.vo.EnterpriseEvaluateVo; import com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationDetailVo; import com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationInfoVo; @@ -27,7 +27,6 @@ import org.dromara.system.mapper.SysUserMapper; import org.dromara.system.service.ISysDictTypeService; import org.springframework.stereotype.Service; import com.zdxt.enforcementcode.domain.EnterpriseComplaint; -import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; import com.zdxt.enforcementcode.domain.EnforcementRegistration; import com.zdxt.enforcementcode.mapper.EnforcementRegistrationMapper; @@ -89,12 +88,12 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat * @return 企业端-执法登记记录列表 */ @Override - public List queryList(EnforcementRegistrationBo bo) { + public List queryList(com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo bo) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper buildQueryWrapper(EnforcementRegistrationBo bo) { + private LambdaQueryWrapper buildQueryWrapper(com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.orderByAsc(EnforcementRegistration::getId); @@ -156,7 +155,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat * 批量查询避免循环中嵌套查询 */ @Override - public TableDataInfo queryEnterprisePageList(EnforcementRegistrationBo bo, PageQuery pageQuery) { + public TableDataInfo queryEnterprisePageList(com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildEnterpriseQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); List records = result.getRecords(); @@ -276,7 +275,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat * 企业端查询条件构建器 * 含: 企业号过滤、已提交过滤、日期过滤、关键字模糊搜索 */ - private LambdaQueryWrapper buildEnterpriseQueryWrapper(EnforcementRegistrationBo bo) { + private LambdaQueryWrapper buildEnterpriseQueryWrapper(com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo bo) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); // 只查已提交的记录 lqw.eq(EnforcementRegistration::getIsSubmit, 1); @@ -331,7 +330,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat * @return 是否新增成功 */ @Override - public Boolean insertByBo(EnforcementRegistrationBo bo) { + public Boolean insertByBo(com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo bo) { EnforcementRegistration add = MapstructUtils.convert(bo, EnforcementRegistration.class); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; @@ -348,7 +347,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat * @return 是否修改成功 */ @Override - public Boolean updateByBo(EnforcementRegistrationBo bo) { + public Boolean updateByBo(com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo bo) { EnforcementRegistration update = MapstructUtils.convert(bo, EnforcementRegistration.class); validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; @@ -378,14 +377,14 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat /** * 企业端-执法登记列表（历史执法信息） - * @param dto + * @param bo * @param pageQuery * @return */ @Override - public TableDataInfo queryEnforcementRegistrationPageList(EnforcementRegistrationQueryDTO dto, PageQuery pageQuery) { + public TableDataInfo queryEnforcementRegistrationPageList(EnforcementRegistrationBo bo, PageQuery pageQuery) { Page page = pageQuery.build(); - IPage result = baseMapper.selectEnforcementRegistrationPage(page, dto); + IPage result = baseMapper.selectEnforcementRegistrationPage(page, bo); return TableDataInfo.build(result); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/AppLawenforcementCaseMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/AppLawenforcementCaseMapper.xml index 8dba96f5..bcc5473b 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/AppLawenforcementCaseMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/AppLawenforcementCaseMapper.xml @@ -19,7 +19,7 @@ left join XZJCDSRXX016987 t2 on t1.c601000 = t2.c601000 - + and t2.C601034 =#{dto.idNumber} @@ -40,7 +40,7 @@ left join XZQZDSRXX997874 t3 on t1.c301000 = t3.c301000 - + and t3.c301010 =#{dto.idNumber} @@ -61,7 +61,7 @@ left join XZCFAJDSRXX594019 t3 on t1.c201000 = t3.c201000 - + and t3.c201016 =#{dto.idNumber} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml index a6336f49..d7a45b9a 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml @@ -31,18 +31,18 @@ FROM enforcement_registration - + AND law_enforcement = #{dto.lawEnforcement} - + AND law_enforcement_item LIKE CONCAT('%', #{dto.lawEnforcementItem}, '%') - + AND is_real_union = #{dto.isRealUnion} - + and (law_enforcement_item_text like concat(concat('%',#{dto.searchValue}),'%') or law_enforcement like concat(concat('%',#{dto.searchValue}),'%') or law_enforcer like concat(concat('%',#{dto.searchValue}),'%') @@ -50,10 +50,10 @@ or enterprise_name like concat(concat('%',#{dto.searchValue}),'%') ) - + and DATE_FORMAT(enforcement_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m') - + AND DATE_FORMAT(enforcement_time, '%Y-%m') >= CONCAT(YEAR(CURDATE()), '-', CASE WHEN QUARTER(CURDATE()) IN (1) THEN '01' WHEN QUARTER(CURDATE()) IN (2) THEN '04' @@ -67,16 +67,16 @@ ELSE '12' END) - + and DATE_FORMAT(enforcement_time, '%Y') = DATE_FORMAT(CURDATE(), '%Y') - + and DATE_FORMAT(enforcement_time, '%Y-%m') = #{dto.dateSearch} - + and DATE_FORMAT(enforcement_time,'%Y-%m-%d') >= #{dto.beginTime} - + and DATE_FORMAT(enforcement_time,'%Y-%m-%d') <= #{dto.endTime} diff --git a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/domain/SysUser.java b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/domain/SysUser.java index d624d8c8..8bf663c0 100644 --- a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/domain/SysUser.java +++ b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/domain/SysUser.java @@ -265,8 +265,21 @@ public class SysUser extends TenantEntity { @TableField("rylb") private String rylb; + private Long roleId; + /** + * 岗位组 + * @param userId + */ + private Long[] postIds; + + /** + * 角色组 + * @param userId + */ + private Long[] roleIds; + public SysUser(Long userId) { this.userId = userId; } diff --git a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java index 4c82a33d..87cd15ac 100644 --- a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java +++ b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java @@ -151,4 +151,6 @@ public class SysUserVo implements Serializable { * 登录账号 */ private String loginName; + + private Integer userSource; } diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml index a218ece2..517e18fa 100644 --- a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml @@ -283,3 +283,15 @@ justauth: security: excludes: - /** + +#深i企对接密钥 测试环境 +siq: + #正式 + # siqUrl: http://10.76.108.3/siqApi + # code: zfjdm + # secretKey: SXRpWEhVN3RHM3ZFbzRQcQ== + #测试 + siqUrl: http://egbpub.siqhz.com/egb/api/thirdauth + code: zfjdm + # secretKey: eWIzY3BMRVNEQXhvUUlXMA== + secretKey: ENC(zTr/tj2VgFxQyunI4eIL7NyRWDPSMPSB0VlwTYeHTdsEWyu1H96xWw==)