diff --git a/zdxt-common/zdxt-common-encrypt/src/main/java/org/dromara/common/encrypt/config/jasypt/JasyptUtils.java b/zdxt-common/zdxt-common-encrypt/src/main/java/org/dromara/common/encrypt/config/jasypt/JasyptUtils.java index 4de768e6..070560c2 100644 --- a/zdxt-common/zdxt-common-encrypt/src/main/java/org/dromara/common/encrypt/config/jasypt/JasyptUtils.java +++ b/zdxt-common/zdxt-common-encrypt/src/main/java/org/dromara/common/encrypt/config/jasypt/JasyptUtils.java @@ -52,9 +52,17 @@ public final class JasyptUtils { //加密 // String s = encryptWithMD5("jdbc:mysql://10.76.108.1:15144/zfjd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8", "ATPfOhpnAVp6yBas7RU"); // System.out.println(s); - String channelcs1 = encryptWithMD5("a06qY2lYeURkNFo4dU5NWD==", "ATPfOhpnAVp6yBas7RU"); +// String channelcs1 = encryptWithMD5("Y8AuVzQ311FOgJ4h07zjkLH8ArJBED3Xxz3Ug0ncPzuLXIVCuB25DA==", "ATPfOhpnAVp6yBas7RU"); // String channelcs2 = decryptWithMD5("jGDVr5PtJpE/xa9FyHzmV2PhFrtctWjETGP5lrUlOyZ68APa81+jbQYA9RNKMI/dldAm7xxTQian8370eQqlYSAyoQV9EYlhsK3MgJkn4+OmnfBNmg227+/hizsmt1swxyW2uQbdlhzw6QaXYJ175Rjtlq1yVx+NOiamEoeSO4hzHWqxKTJT/y19fHg6QTuQc3r+PEsAFQp503HsvC5lgA==", "ATPfOhpnAVp6yBas7RU"); - System.out.println(channelcs1); - System.out.println(decryptWithMD5("amY2xX5mjlyBg8wGGqaZoZv1vWCHnsj/l5a7gsGimead7xTC773KyQ==","ATPfOhpnAVp6yBas7RU")); +// System.out.println(channelcs1); + System.out.println("深I企业 ： " + decryptWithMD5("Y8AuVzQ311FOgJ4h07zjkLH8ArJBED3Xxz3Ug0ncPzuLXIVCuB25DA==","ATPfOhpnAVp6yBas7RU")); + + System.out.println("市认证 ： " + decryptWithMD5("pHNm/o0+6S+HjrM5nuMiPRfkrHS1tXYD5i25OBtM4dWSi6MvH6iXfw==","ATPfOhpnAVp6yBas7RU")); + System.out.println("深政易 ： " + decryptWithMD5("KlJ9leroG2ZnKMUbnOZfpGkZNv/THSthpbSfnp4REq/N4ta1Rx729h0be9TBOkma","ATPfOhpnAVp6yBas7RU")); + + System.out.println("民生诉求 ： http://10.76.108.1:12004/mssq_proxy"); + System.out.println("市监 ： http://10.132.108.3/sjWeb"); + // +// System.out.println(decryptWithMD5("Y8AuVzQ311FOgJ4h07zjkLH8ArJBED3Xxz3Ug0ncPzuLXIVCuB25DA==","ATPfOhpnAVp6yBas7RU")); } } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCaseInfoController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCaseInfoController.java index f72cd184..a669d24d 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCaseInfoController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfCaseInfoController.java @@ -69,7 +69,7 @@ public class AppEnfCaseInfoController { @GetMapping("/queryXzcfList") public TableDataInfo queryXzcfList(SxtXzcfajjbxx026705Bo bo, PageQuery pageQuery) { - TableDataInfo list = sxtXzcfajjbxx026705Service.selectXzcfHistoryList(bo,pageQuery); + TableDataInfo list = sxtXzcfajjbxx026705Service.selectXzcfHistoryList(bo,pageQuery); return list; } } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/SxtXzcfInfoVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/SxtXzcfInfoVo.java new file mode 100644 index 00000000..36442b0c --- /dev/null +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/SxtXzcfInfoVo.java @@ -0,0 +1,35 @@ +package com.zdxt.enforcementcode.domain.vo; + +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import com.zdxt.enforcementcode.domain.SxtXzcfajjbxx026705; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serializable; + + +/** + * 行政处罚案件信息视图对象 sxt_xzcfajjbxx026705 + * + * @author Lion Li + * @date 2026-08-03 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = SxtXzcfajjbxx026705.class) +public class SxtXzcfInfoVo implements Serializable { + + private String c201000; + + private String c201003; + + private String c201002; + + private String c206011; + + private String c206013; + + private String C206010; + + private String c201016; +} diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/SxtXzcfajjbxx026705Vo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/SxtXzcfajjbxx026705Vo.java index 274c4231..7b48c6ad 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/SxtXzcfajjbxx026705Vo.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/SxtXzcfajjbxx026705Vo.java @@ -277,5 +277,18 @@ public class SxtXzcfajjbxx026705Vo implements Serializable { @ExcelProperty(value = "备用字段2") private String beiyong2; + /** + * 决定日期 + */ + @ExcelProperty(value = "决定日期") + private String c206013; + + + /** + * 处罚决定种类 + */ + @ExcelProperty(value = "处罚决定种类") + private String c206011; + } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/SxtXzcfajjbxx026705Mapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/SxtXzcfajjbxx026705Mapper.java index 5a640e9d..709389aa 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/SxtXzcfajjbxx026705Mapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/SxtXzcfajjbxx026705Mapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zdxt.enforcementcode.domain.SxtXzcfajjbxx026705; import com.zdxt.enforcementcode.domain.bo.SxtXzcfajjbxx026705Bo; import com.zdxt.enforcementcode.domain.bo.Xzcfajjbxx026705Bo; +import com.zdxt.enforcementcode.domain.vo.SxtXzcfInfoVo; import com.zdxt.enforcementcode.domain.vo.SxtXzcfajjbxx026705Vo; import com.zdxt.enforcementcode.domain.vo.Xzcfajjbxx026705Vo; import org.apache.ibatis.annotations.Param; @@ -19,6 +20,6 @@ import java.util.List; */ public interface SxtXzcfajjbxx026705Mapper extends BaseMapperPlus { - List selectXzcfHistoryList(@Param("bo") SxtXzcfajjbxx026705Bo bo, @Param("page") Page page); + List selectXzcfHistoryList(@Param("bo") SxtXzcfajjbxx026705Bo bo, @Param("page") Page page); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISxtXzcfajjbxx026705Service.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISxtXzcfajjbxx026705Service.java index 50dd25d3..4b0d327f 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISxtXzcfajjbxx026705Service.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ISxtXzcfajjbxx026705Service.java @@ -1,6 +1,7 @@ package com.zdxt.enforcementcode.service; import com.zdxt.enforcementcode.domain.bo.Xzcfajjbxx026705Bo; +import com.zdxt.enforcementcode.domain.vo.SxtXzcfInfoVo; import com.zdxt.enforcementcode.domain.vo.SxtXzcfajjbxx026705Vo; import com.zdxt.enforcementcode.domain.bo.SxtXzcfajjbxx026705Bo; import com.zdxt.enforcementcode.domain.vo.Xzcfajjbxx026705Vo; @@ -68,5 +69,5 @@ public interface ISxtXzcfajjbxx026705Service { */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); - TableDataInfo selectXzcfHistoryList(SxtXzcfajjbxx026705Bo bo, PageQuery pageQuery); + TableDataInfo selectXzcfHistoryList(SxtXzcfajjbxx026705Bo bo, PageQuery pageQuery); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SxtXzcfajjbxx026705ServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SxtXzcfajjbxx026705ServiceImpl.java index 6127cf09..d65ca201 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SxtXzcfajjbxx026705ServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/SxtXzcfajjbxx026705ServiceImpl.java @@ -1,6 +1,7 @@ package com.zdxt.enforcementcode.service.impl; import com.zdxt.enforcementcode.domain.bo.Xzcfajjbxx026705Bo; +import com.zdxt.enforcementcode.domain.vo.SxtXzcfInfoVo; import com.zdxt.enforcementcode.domain.vo.Xzcfajjbxx026705Vo; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -172,9 +173,9 @@ public class SxtXzcfajjbxx026705ServiceImpl implements ISxtXzcfajjbxx026705Servi } @Override - public TableDataInfo selectXzcfHistoryList(SxtXzcfajjbxx026705Bo bo, PageQuery pageQuery) { - Page page = pageQuery.build(); - List list =baseMapper.selectXzcfHistoryList(bo, page); + public TableDataInfo selectXzcfHistoryList(SxtXzcfajjbxx026705Bo bo, PageQuery pageQuery) { + Page page = pageQuery.build(); + List list =baseMapper.selectXzcfHistoryList(bo, page); return TableDataInfo.build(list); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/SxtXzcfajjbxx026705Mapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/SxtXzcfajjbxx026705Mapper.xml index bb5a9935..2c08e579 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/SxtXzcfajjbxx026705Mapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/SxtXzcfajjbxx026705Mapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - select a.c201000, a.c201003, @@ -20,7 +20,6 @@ left join sxt_xzcfajdsrxx594019 c on a.c201000 = c.c201000 where - c.c201016 = - #{bo.c201016} order by b.c206013 desc + c.c201016 = #{bo.c201016} order by b.c206013 desc