轮播图

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseLoginController.java

@@ -24,7 +24,7 @@ import java.util.Map;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/enterprise/login")
+@RequestMapping("/app-ent/enterprise/login")
 public class AppEnterpriseLoginController {
 
     @Autowired
@@ -34,7 +34,7 @@ public class AppEnterpriseLoginController {
      *  企业端用户登录（深i企）
      */
     @SaIgnore
-    @ApiResponse(description = "企业端-用户登录")
+    @ApiResponse(description = "企业端-用户登录（深i企）")
     @PostMapping("/siqLogin")
     public R<Map<String, Object>> siqLogin(@RequestBody AppEnterpriseLoginBo bo){
         Map<String, Object> result = appEnterpriseLoginService.siqLogin(bo);

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bean/EnforcementCarouselBanner.java

@@ -13,7 +13,7 @@ import java.io.Serial;
  * 轮播公告信息对象 enforcement_carousel_banner
  *
  * @author Lion Li
- * @date 2026-05-08
+ * @date 2026-05-13
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -69,11 +69,21 @@ public class EnforcementCarouselBanner extends BaseEntity {
      */
     private Long sort;
 
+    /**
+     * 内容(富文本内容)
+     */
+    private String content;
+
     /**
      * 状态 1-待发布 2-已发布 3-已下架
      */
     private Long status;
 
+    /**
+     * 类型 0-富文本 1-外部链接
+     */
+    private Long type;
+
     /**
      * 是否删除 0=否 1=是
      */

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementCarouselBannerBo.java

@@ -11,11 +11,12 @@ import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 import java.util.Date;
 
+
 /**
  * 轮播公告信息业务对象 enforcement_carousel_banner
  *
  * @author Lion Li
- * @date 2026-05-08
+ * @date 2026-05-13
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -68,11 +69,21 @@ public class EnforcementCarouselBannerBo extends BaseEntity {
      */
     private Long sort;
 
+    /**
+     * 内容(富文本内容)
+     */
+    private String content;
+
     /**
      * 状态 1-待发布 2-已发布 3-已下架
      */
     private Long status;
 
+    /**
+     * 类型 0-富文本 1-外部链接
+     */
+    private Long type;
+
     /**
      * 是否删除 0=否 1=是
      */

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementCarouselBannerVo.java

@@ -1,7 +1,6 @@
 package com.zdxt.enforcementcode.domain.vo;
 
 import java.util.Date;
-
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
 import com.zdxt.enforcementcode.domain.bean.EnforcementCarouselBanner;
@@ -12,7 +11,7 @@ import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-
+import java.util.Date;
 
 
 
@@ -20,7 +19,7 @@ import java.io.Serializable;
  * 轮播公告信息视图对象 enforcement_carousel_banner
  *
  * @author Lion Li
- * @date 2026-05-08
+ * @date 2026-05-13
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -85,12 +84,24 @@ public class EnforcementCarouselBannerVo implements Serializable {
     @ExcelProperty(value = "排序号，数值越小越靠前")
     private Long sort;
 
+    /**
+     * 内容(富文本内容)
+     */
+    @ExcelProperty(value = "内容(富文本内容)")
+    private String content;
+
     /**
      * 状态 1-待发布 2-已发布 3-已下架
      */
     @ExcelProperty(value = "状态 1-待发布 2-已发布 3-已下架")
     private Long status;
 
+    /**
+     * 类型 0-富文本 1-外部链接
+     */
+    @ExcelProperty(value = "类型 0-富文本 1-外部链接")
+    private Long type;
+
     /**
      * 是否删除 0=否 1=是
      */

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/enterprise/EnforcementRegistrationListVo.java

@@ -147,6 +147,12 @@ public class EnforcementRegistrationListVo implements Serializable {
      */
     private int  isRealUnion;
 
+    /**
+     * 是否投诉
+     */
+    private int  isComplaint;
+
+
     /**
      * 评价按钮是否显示
      * @return

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java

@@ -342,6 +342,9 @@ public class AppEnterpriseLoginServiceImpl implements IAppEnterpriseLoginService
             enterpriseInformationMapper.updateById(existingEnterprise);
             log.info("企业信息更新成功: enterpriseNumber={}, enterpriseId={}",
                 enterpriseNumber, existingEnterprise.getId());
+
+            // TODO: 2026/5/13 测试时候使用，生产环境需要关闭
+            qrCodeGenerate(existingEnterprise);
             return existingEnterprise;
         } else {
             log.info("企业不存在，执行新增操作: enterpriseNumber={}", enterpriseNumber);
@@ -499,7 +502,7 @@ public class AppEnterpriseLoginServiceImpl implements IAppEnterpriseLoginService
         LoginHelper.login(loginUser, model);
 
         String token = StpUtil.getTokenValue();
-        
+
         // 调试：检查 Token 是否成功存储到 Redis
         long timeout = StpUtil.getTokenTimeout();
         log.info("生成token成功: userId={}, token={}, timeout={}秒", user.getUserId(), token, timeout);
@@ -518,19 +521,19 @@ public class AppEnterpriseLoginServiceImpl implements IAppEnterpriseLoginService
         JSONObject userInfo = new JSONObject();
 
         userInfo.put("userId", "100001");
-        userInfo.put("account", "test_user_" + (code != null ? code.hashCode() % 1000 : 1));
+        userInfo.put("account", "test001" + (code != null ? code.hashCode() % 1000 : 1));
         userInfo.put("userName", "测试用户");
         userInfo.put("phone", IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, "13800138000"));
 
-        userInfo.put("corpCid", "91440300788302281W");
-        userInfo.put("corpName", "吉田拉链（深圳）有限公司公明工厂");
+        userInfo.put("corpCid", "91440300769156389U");
+        userInfo.put("corpName", "新粤云（深圳）信息技术有限公司");
         userInfo.put("companyOrgType", "有限责任公司");
         userInfo.put("establishDate", "2010-01-15");
-        userInfo.put("businessScope", "生产经营拉链、服装辅料及相关产品");
-        userInfo.put("regLocation", "深圳市光明新区公明街道塘尾社区宝塘工业区");
+        userInfo.put("businessScope", "安防产品、电子产品的技术开发与销售；计算机软件的技术开发；计算机系统集成；国内贸易（不含专营、专控、专卖商品及限制项目）；汽车购销。（法律、行政法规、国务院决定禁止的项目除外，限制的项目须取得许可后方可经营）信息技术咨询服务。（除依法须经批准的项目外，凭营业执照依法自主开展经营活动）");
+        userInfo.put("regLocation", "深圳市南山区粤海街道高新区社区白石路3609号深圳湾科技生态园二区9栋B4座616");
         userInfo.put("regCapital", "5000万元人民币");
         userInfo.put("legalPersonName", "张三");
-        userInfo.put("termStart", "2010-01-15");
+        userInfo.put("termStart", "2004-11-12");
         userInfo.put("termEnd", "2040-01-14");
 
         log.info("返回模拟深i企用户信息: userId={}, account={}, corpName={}",

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementCarouselBannerServiceImpl.java

@@ -24,7 +24,7 @@ import java.util.Collection;
  * 轮播公告信息Service业务层处理
  *
  * @author Lion Li
- * @date 2026-05-08
+ * @date 2026-05-13
  */
 @Slf4j
 @RequiredArgsConstructor
@@ -82,7 +82,9 @@ public class EnforcementCarouselBannerServiceImpl implements IEnforcementCarouse
         lqw.eq(StringUtils.isNotBlank(bo.getLinkUrl()), EnforcementCarouselBanner::getLinkUrl, bo.getLinkUrl());
         lqw.eq(StringUtils.isNotBlank(bo.getImageUrl()), EnforcementCarouselBanner::getImageUrl, bo.getImageUrl());
         lqw.eq(bo.getSort() != null, EnforcementCarouselBanner::getSort, bo.getSort());
+        lqw.eq(StringUtils.isNotBlank(bo.getContent()), EnforcementCarouselBanner::getContent, bo.getContent());
         lqw.eq(bo.getStatus() != null, EnforcementCarouselBanner::getStatus, bo.getStatus());
+        lqw.eq(bo.getType() != null, EnforcementCarouselBanner::getType, bo.getType());
         lqw.eq(bo.getIsDelete() != null, EnforcementCarouselBanner::getIsDelete, bo.getIsDelete());
         return lqw;
     }

zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml

@@ -35,7 +35,7 @@ logging:
   level:
     org.dromara: @logging.level@
     org.springframework: warn
-    org.mybatis.spring.mapper: error
+    org.mybatis.spring.mapper: debug
     org.apache.fury: warn
   config: classpath:logback-plus.xml
 
@@ -122,6 +122,9 @@ security:
     - /swagger-resources/**
     - /webjars/**
     - /v3/api-docs/**
+    - /doc.html
+    - /doc.html/**
+    - /knife4j/**
     - /warm-flow-ui/config
     # enforcement-code 统计面板（静态HTML页面调用，无token）
     - /code/statisticalPanel/**
@@ -322,7 +325,8 @@ warm-flow:
 
 # 项目相关配置
 sjdm:
-  profile: /usr/local/uploadPath
+#  profile: /usr/local/uploadPath
+  profile: /Users/vincent/uploadPath
   qr_code_url: /usr/local/uploads/zfjd_logo.png
 
 # Spring Boot RestTemplate 超时配置