diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementRegistrationController.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementRegistrationController.java new file mode 100644 index 00000000..06136083 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnforcementRegistrationController.java @@ -0,0 +1,49 @@ +package com.zdxt.enforcementcode.controller.app.enterprise; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo; +import com.zdxt.enforcementcode.domain.vo.EnforcementRegistrationVo; +import com.zdxt.enforcementcode.service.IEnforcementRegistrationService; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.web.core.BaseController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 企业端-执法登记记录 + * + * @author Lion Li + * @date 2026-04-17 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/app/enterprise/enforcement_registration") +public class AppEnforcementRegistrationController extends BaseController { + + private final IEnforcementRegistrationService enforcementRegistrationService; + + /** + * 查询企业端-执法登记记录列表 + */ + //@SaCheckPermission("enforcementcode:registration:list") + @GetMapping("/list") + public TableDataInfo list(EnforcementRegistrationBo bo, PageQuery pageQuery) { + return enforcementRegistrationService.queryPageList(bo, pageQuery); + } + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/TestEnfDemoController.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/TestEnfDemoController.java new file mode 100644 index 00000000..3aad3428 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/TestEnfDemoController.java @@ -0,0 +1,105 @@ +package com.zdxt.enforcementcode.controller.app.enterprise; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import com.zdxt.enforcementcode.domain.vo.TestEnfDemoVo; +import com.zdxt.enforcementcode.domain.bo.TestEnfDemoBo; +import com.zdxt.enforcementcode.service.ITestEnfDemoService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * enf测试单 + * + * @author Lion Li + * @date 2026-04-18 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/app/enterprise/enfDemo") +public class TestEnfDemoController extends BaseController { + + private final ITestEnfDemoService testEnfDemoService; + + /** + * 查询enf测试单列表 + */ + /*@SaCheckPermission("enforcementcode:enfDemo:list")*/ + @GetMapping("/list") + public TableDataInfo list(TestEnfDemoBo bo, PageQuery pageQuery) { + return testEnfDemoService.queryPageList(bo, pageQuery); + } + + /** + * 导出enf测试单列表 + */ + /*@SaCheckPermission("enforcementcode:enfDemo:export")*/ + @Log(title = "enf测试单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TestEnfDemoBo bo, HttpServletResponse response) { + List list = testEnfDemoService.queryList(bo); + ExcelUtil.exportExcel(list, "enf测试单", TestEnfDemoVo.class, response); + } + + /** + * 获取enf测试单详细信息 + * + * @param id 主键 + */ + /*@SaCheckPermission("enforcementcode:enfDemo:query")*/ + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(testEnfDemoService.queryById(id)); + } + + /** + * 新增enf测试单 + */ + /*@SaCheckPermission("enforcementcode:enfDemo:add")*/ + @Log(title = "enf测试单", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TestEnfDemoBo bo) { + return toAjax(testEnfDemoService.insertByBo(bo)); + } + + /** + * 修改enf测试单 + */ + /*@SaCheckPermission("enforcementcode:enfDemo:edit")*/ + @Log(title = "enf测试单", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TestEnfDemoBo bo) { + return toAjax(testEnfDemoService.updateByBo(bo)); + } + + /** + * 删除enf测试单 + * + * @param ids 主键串 + */ + /*@SaCheckPermission("enforcementcode:enfDemo:remove")*/ + @Log(title = "enf测试单", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(testEnfDemoService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/TestEnfDemo.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/TestEnfDemo.java new file mode 100644 index 00000000..52ebfeba --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/TestEnfDemo.java @@ -0,0 +1,78 @@ +package com.zdxt.enforcementcode.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * enf测试单对象 test_enf_demo + * + * @author Lion Li + * @date 2026-04-18 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("test_enf_demo") +public class TestEnfDemo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id") + private Long id; + + /** + * 文本 + */ + private String enfText; + + /** + * 长文本 + */ + private String enfContent; + + /** + * 部门id + */ + private Long deptId; + + /** + * 用户id + */ + private Long userId; + + /** + * 排序号 + */ + private Long orderNum; + + /** + * key键 + */ + private String testKey; + + /** + * 值 + */ + private String value; + + /** + * 版本 + */ + @Version + private Long version; + + /** + * 删除标志 + */ + @TableLogic + private Long delFlag; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/TestEnfDemoBo.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/TestEnfDemoBo.java new file mode 100644 index 00000000..bef7d2a3 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/TestEnfDemoBo.java @@ -0,0 +1,65 @@ +package com.zdxt.enforcementcode.domain.bo; + +import com.zdxt.enforcementcode.domain.TestEnfDemo; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * enf测试单业务对象 test_enf_demo + * + * @author Lion Li + * @date 2026-04-18 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TestEnfDemo.class, reverseConvertGenerate = false) +public class TestEnfDemoBo extends BaseEntity { + + /** + * 主键 + */ + @NotNull(message = "主键不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 文本 + */ + private String enfText; + + /** + * 长文本 + */ + private String enfContent; + + /** + * 部门id + */ + private Long deptId; + + /** + * 用户id + */ + private Long userId; + + /** + * 排序号 + */ + private Long orderNum; + + /** + * key键 + */ + private String testKey; + + /** + * 值 + */ + private String value; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/TestEnfDemoVo.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/TestEnfDemoVo.java new file mode 100644 index 00000000..0035e279 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/TestEnfDemoVo.java @@ -0,0 +1,80 @@ +package com.zdxt.enforcementcode.domain.vo; + +import com.zdxt.enforcementcode.domain.TestEnfDemo; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * enf测试单视图对象 test_enf_demo + * + * @author Lion Li + * @date 2026-04-18 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TestEnfDemo.class) +public class TestEnfDemoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long id; + + /** + * 文本 + */ + @ExcelProperty(value = "文本") + private String enfText; + + /** + * 长文本 + */ + @ExcelProperty(value = "长文本") + private String enfContent; + + /** + * 部门id + */ + @ExcelProperty(value = "部门id") + private Long deptId; + + /** + * 用户id + */ + @ExcelProperty(value = "用户id") + private Long userId; + + /** + * 排序号 + */ + @ExcelProperty(value = "排序号") + private Long orderNum; + + /** + * key键 + */ + @ExcelProperty(value = "key键") + private String testKey; + + /** + * 值 + */ + @ExcelProperty(value = "值") + private String value; + + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/TestEnfDemoMapper.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/TestEnfDemoMapper.java new file mode 100644 index 00000000..bdc2823f --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/TestEnfDemoMapper.java @@ -0,0 +1,15 @@ +package com.zdxt.enforcementcode.mapper; + +import com.zdxt.enforcementcode.domain.TestEnfDemo; +import com.zdxt.enforcementcode.domain.vo.TestEnfDemoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * enf测试单Mapper接口 + * + * @author Lion Li + * @date 2026-04-18 + */ +public interface TestEnfDemoMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ITestEnfDemoService.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ITestEnfDemoService.java new file mode 100644 index 00000000..14711be0 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/ITestEnfDemoService.java @@ -0,0 +1,68 @@ +package com.zdxt.enforcementcode.service; + +import com.zdxt.enforcementcode.domain.vo.TestEnfDemoVo; +import com.zdxt.enforcementcode.domain.bo.TestEnfDemoBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * enf测试单Service接口 + * + * @author Lion Li + * @date 2026-04-18 + */ +public interface ITestEnfDemoService { + + /** + * 查询enf测试单 + * + * @param id 主键 + * @return enf测试单 + */ + TestEnfDemoVo queryById(Long id); + + /** + * 分页查询enf测试单列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return enf测试单分页列表 + */ + TableDataInfo queryPageList(TestEnfDemoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的enf测试单列表 + * + * @param bo 查询条件 + * @return enf测试单列表 + */ + List queryList(TestEnfDemoBo bo); + + /** + * 新增enf测试单 + * + * @param bo enf测试单 + * @return 是否新增成功 + */ + Boolean insertByBo(TestEnfDemoBo bo); + + /** + * 修改enf测试单 + * + * @param bo enf测试单 + * @return 是否修改成功 + */ + Boolean updateByBo(TestEnfDemoBo bo); + + /** + * 校验并批量删除enf测试单信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/TestEnfDemoServiceImpl.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/TestEnfDemoServiceImpl.java new file mode 100644 index 00000000..e2849242 --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/TestEnfDemoServiceImpl.java @@ -0,0 +1,138 @@ +package com.zdxt.enforcementcode.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.zdxt.enforcementcode.domain.bo.TestEnfDemoBo; +import com.zdxt.enforcementcode.domain.vo.TestEnfDemoVo; +import com.zdxt.enforcementcode.domain.TestEnfDemo; +import com.zdxt.enforcementcode.mapper.TestEnfDemoMapper; +import com.zdxt.enforcementcode.service.ITestEnfDemoService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * enf测试单Service业务层处理 + * + * @author Lion Li + * @date 2026-04-18 + */ +@Slf4j +@RequiredArgsConstructor +@Service +public class TestEnfDemoServiceImpl implements ITestEnfDemoService { + + private final TestEnfDemoMapper baseMapper; + + /** + * 查询enf测试单 + * + * @param id 主键 + * @return enf测试单 + */ + @Override + public TestEnfDemoVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询enf测试单列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return enf测试单分页列表 + */ + @Override + public TableDataInfo queryPageList(TestEnfDemoBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的enf测试单列表 + * + * @param bo 查询条件 + * @return enf测试单列表 + */ + @Override + public List queryList(TestEnfDemoBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TestEnfDemoBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(TestEnfDemo::getId); + lqw.eq(StringUtils.isNotBlank(bo.getEnfText()), TestEnfDemo::getEnfText, bo.getEnfText()); + lqw.eq(StringUtils.isNotBlank(bo.getEnfContent()), TestEnfDemo::getEnfContent, bo.getEnfContent()); + lqw.eq(bo.getDeptId() != null, TestEnfDemo::getDeptId, bo.getDeptId()); + lqw.eq(bo.getUserId() != null, TestEnfDemo::getUserId, bo.getUserId()); + lqw.eq(bo.getOrderNum() != null, TestEnfDemo::getOrderNum, bo.getOrderNum()); + lqw.eq(StringUtils.isNotBlank(bo.getTestKey()), TestEnfDemo::getTestKey, bo.getTestKey()); + lqw.eq(StringUtils.isNotBlank(bo.getValue()), TestEnfDemo::getValue, bo.getValue()); + return lqw; + } + + /** + * 新增enf测试单 + * + * @param bo enf测试单 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TestEnfDemoBo bo) { + TestEnfDemo add = MapstructUtils.convert(bo, TestEnfDemo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改enf测试单 + * + * @param bo enf测试单 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TestEnfDemoBo bo) { + TestEnfDemo update = MapstructUtils.convert(bo, TestEnfDemo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TestEnfDemo entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除enf测试单信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/TestEnfDemoMapper.xml b/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/TestEnfDemoMapper.xml new file mode 100644 index 00000000..170a029b --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/TestEnfDemoMapper.xml @@ -0,0 +1,6 @@ + + + + diff --git a/script/sql/zfjd-refactoring-v1/1001-修改用于测试的账号密码.sql b/script/sql/zfjd-refactoring-v1/1001-修改用于测试的账号密码.sql index d8b3ac82..ee82cd82 100644 --- a/script/sql/zfjd-refactoring-v1/1001-修改用于测试的账号密码.sql +++ b/script/sql/zfjd-refactoring-v1/1001-修改用于测试的账号密码.sql @@ -13,3 +13,94 @@ update enterprise_user set password='18e70eb4a12f389c2969d09d16964ed2',salt='413 update enterprise_user set password='f1035f44ee5654be31465a6be5cd4240',salt='413f53' where user_id='17608565612'; update enterprise_user set password='0071ba98dde715b02b82b22acfc7379c',salt='413f53' where user_id='17608601734'; update enterprise_user set password='efc923c94bbb4a3d617d6865d7b7e694',salt='413f53' where user_id='17608556724'; + + +--测试表 +create table test_enf_demo +( + id bigint not null comment '主键' + primary key, + enf_text varchar(255) null comment '文本', + enf_content longtext null comment '长文本', + tenant_id varchar(20) default '000000' null comment '租户编号', + dept_id bigint null comment '部门id', + user_id bigint null comment '用户id', + order_num int default 0 null comment '排序号', + test_key varchar(255) null comment 'key键', + value varchar(255) null comment '值', + version int default 0 null comment '版本', + create_dept varchar(100) null comment '创建部门', + create_time datetime null comment '创建时间', + create_by bigint null comment '创建人', + update_time datetime null comment '更新时间', + update_by bigint null comment '更新人', + del_flag int default 0 null comment '删除标志' +) + comment 'enf测试单表'; + + +-- 为 test_enf_demo 表生成 10000 条测试数据 +-- 使用存储过程批量插入 + +DROP PROCEDURE IF EXISTS generate_test_enf_demo_data; + +DELIMITER $$ + +CREATE PROCEDURE generate_test_enf_demo_data() +BEGIN + DECLARE i INT DEFAULT 1; + DECLARE batch_size INT DEFAULT 500; + DECLARE current_batch INT DEFAULT 0; + + -- 关闭自动提交,提升插入性能 + SET autocommit = 0; + + WHILE i <= 10000 DO + INSERT INTO test_enf_demo ( + id, enf_text, enf_content, tenant_id, dept_id, user_id, + order_num, test_key, value, version, + create_dept, create_time, create_by, update_time, update_by, del_flag + ) VALUES ( + i, + CONCAT('文本_', i), + CONCAT('这是第', i, '条测试长文本内容,用于测试数据填充。'), + '000000', + 100 + FLOOR(RAND() * 50), + 1000 + FLOOR(RAND() * 500), + i, + CONCAT('KEY_', LPAD(i, 5, '0')), + CONCAT('VAL_', LPAD(i, 5, '0')), + 0, + CONCAT('部门_', FLOOR(RAND() * 20)), + DATE_ADD('2024-01-01', INTERVAL FLOOR(RAND() * 730) DAY), + 1, + NOW(), + 1, + 0 + ); + + -- 每 500 条提交一次 + SET current_batch = current_batch + 1; + IF current_batch >= batch_size THEN + COMMIT; + SET current_batch = 0; +END IF; + + SET i = i + 1; +END WHILE; + + -- 提交剩余数据 +COMMIT; +SET autocommit = 1; +END$$ + +DELIMITER ; + +-- 执行存储过程 +CALL generate_test_enf_demo_data(); + +-- 清理存储过程 +DROP PROCEDURE IF EXISTS generate_test_enf_demo_data; + +-- 验证数据量 +SELECT COUNT(*) AS total_count FROM test_enf_demo; diff --git a/zdxt-web-client/zdxt-enforcement-code-app/package.json b/zdxt-web-client/zdxt-enforcement-code-app/package.json index eb5d97cc..23fe6da6 100644 --- a/zdxt-web-client/zdxt-enforcement-code-app/package.json +++ b/zdxt-web-client/zdxt-enforcement-code-app/package.json @@ -12,34 +12,32 @@ "app-build:enforcement-prod": "vite build --mode enforcement-prod --outDir dist/enforcement-prod" }, "dependencies": { - "@zxing/library": "^0.20.0", - "axios": "^1.6.7", + "@zxing/library": "^0.21.3", + "axios": "^1.15.0", "compressorjs": "^1.2.1", "core-js": "^3.44.0", - "crawlee": "^3.12.0", "crawler": "^2.0.2", "crypto-js": "^4.2.0", "date-fns": "^3.6.0", - "echarts": "^5.5.0", + "echarts": "^6.0.0", "html2canvas": "^1.4.1", "jsonp": "^0.2.1", "lodash": "^4.17.21", "mitt": "^3.0.1", "pdfh5": "^1.4.9", "pdfjs-dist": "^4.10.38", - "pinia": "^2.1.7", - "pinia-plugin-persistedstate": "^3.2.1", - "playwright": "^1.48.2", + "pinia": "^3.0.4", + "pinia-plugin-persistedstate": "^4.7.1", "sass": "^1.71.1", "szient-js-sdk": "^1.2.2", - "vant": "^4.8.5", + "vant": "^4.9.24", "vconsole": "^3.15.1", - "vue": "^3.4.21", + "vue": "^3.5.32", "vue-dompurify-html": "^5.0.1", - "vue-i18n": "^9.9.1", + "vue-i18n": "^11.3.2", "vue-pdf": "^1.0.0", "vue-pdf-embed": "^1.2.1", - "vue-qrcode-reader": "^5.5.3", + "vue-qrcode-reader": "^5.7.3", "vue-router": "^4.3.0", "vue3-pdfjs": "^0.0.1", "weixin-js-sdk": "^1.6.5" @@ -54,8 +52,8 @@ "less": "^4.2.0", "less-loader": "^12.2.0", "postcss-pxtorem": "^6.1.0", - "unplugin-auto-import": "^0.17.5", - "unplugin-vue-components": "^0.26.0", + "unplugin-auto-import": "^21.0.0", + "unplugin-vue-components": "^32.0.0", "vite": "^6.2.6", "vite-plugin-compression": "^0.5.1", "vite-plugin-eslint": "^1.8.1", diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/api/demo/index.js b/zdxt-web-client/zdxt-enforcement-code-app/src/api/demo/index.js new file mode 100644 index 00000000..25015a67 --- /dev/null +++ b/zdxt-web-client/zdxt-enforcement-code-app/src/api/demo/index.js @@ -0,0 +1,15 @@ +import { _get, _post, _delete } from "../../http/index"; + +let baseUrl = "/app/enterprise/enfDemo"; + +// 查询enf测试单列表(分页) +export const getEnfDemoList = (params, success, error) => _get(baseUrl + "/list", params, success, error); + +// 获取enf测试单详情 +export const getEnfDemoDetail = (id, success, error) => _get(baseUrl + "/" + id, null, success, error); + +// 新增enf测试单 +export const addEnfDemo = (params, success, error) => _post(baseUrl, params, success, error); + +// 删除enf测试单 +export const deleteEnfDemo = (ids, success, error) => _delete(baseUrl + "/" + ids, null, success, error); diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/api/enterprise/index.js b/zdxt-web-client/zdxt-enforcement-code-app/src/api/enterprise/index.js index 3449bb37..8ea69c95 100644 --- a/zdxt-web-client/zdxt-enforcement-code-app/src/api/enterprise/index.js +++ b/zdxt-web-client/zdxt-enforcement-code-app/src/api/enterprise/index.js @@ -19,7 +19,7 @@ export const getEnterpriseMerchantAuthorization = (params, success, error) => _g export const queryEnterpriseInformationQrCode = (enterpriseNumber, success, error) => _get(enterpriseAppBaseUrl+"/enterpriseInfo/getQrCode/"+enterpriseNumber,null,success,error) //查询企业执法登记列表-企业端修改联合检查查询语句 -export const queryEnterpriseList = (params, success, error) => _get(enterpriseAppBaseUrl+"/registration/queryEnterpriseList",params,success,error) +export const queryEnforcementRegistrationList = (params, success, error) => _get(enterpriseAppBaseUrl+"/app/enterprise/enforcement_registration/list",params,success,error) //深i企登录-暂时没有环境调通 export const getSiqLoginAuth = (params, success, error) => _post(enterpriseAppBaseUrl +"/thirdLogin/siqLogin",params,success,error); diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/common/globalExpandRouter.js b/zdxt-web-client/zdxt-enforcement-code-app/src/common/globalExpandRouter.js index e4ff5a18..37a9578e 100644 --- a/zdxt-web-client/zdxt-enforcement-code-app/src/common/globalExpandRouter.js +++ b/zdxt-web-client/zdxt-enforcement-code-app/src/common/globalExpandRouter.js @@ -4,7 +4,7 @@ const $globalRouterModules = (routes) => { let pathArr = []; let nameArr = []; const modulesRouter = import.meta.glob( - ["../router/enterprise-app/ent-main-router.js"] + ["../router/enterprise-app/ent-main-router.js", "../router/demo/demo-main-router.js"] ,{ eager: true, }); diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/common/globalInitialize.js b/zdxt-web-client/zdxt-enforcement-code-app/src/common/globalInitialize.js index 542c180f..0940206d 100644 --- a/zdxt-web-client/zdxt-enforcement-code-app/src/common/globalInitialize.js +++ b/zdxt-web-client/zdxt-enforcement-code-app/src/common/globalInitialize.js @@ -1,4 +1,5 @@ import VueDompurifyHtml from 'vue-dompurify-html'; // 替代v-html插件防止xss +import { createPinia } from 'pinia'; // 显式导入避免auto-import模块隔离问题 import piniaPluginPersistedstate from 'pinia-plugin-persistedstate' import { setGoodsNum, isObject } from '@/util/util'; // 导出工具类 import '@/assets/style/index.less'; // 引入项目样式文件 diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/common/globalLocales.js b/zdxt-web-client/zdxt-enforcement-code-app/src/common/globalLocales.js index e8fe092a..de90b200 100644 --- a/zdxt-web-client/zdxt-enforcement-code-app/src/common/globalLocales.js +++ b/zdxt-web-client/zdxt-enforcement-code-app/src/common/globalLocales.js @@ -28,6 +28,7 @@ let locales = { }; const $globalLang = createI18n({ + legacy: false, // 使用 Composition API 模式(vue-i18n v11 要求) locale: DEFAULT_LANG, messages: locales, }); diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/router/demo/demo-main-router.js b/zdxt-web-client/zdxt-enforcement-code-app/src/router/demo/demo-main-router.js new file mode 100644 index 00000000..65e6a39e --- /dev/null +++ b/zdxt-web-client/zdxt-enforcement-code-app/src/router/demo/demo-main-router.js @@ -0,0 +1,14 @@ + +const routes = [ + // Demo - 测试单列表 + { + path: "/demo/enfDemoList", + name: "enfDemoList", + component: () => import("@/views/demo/TestEnfDemoList.vue"), + meta: { + isKeepAlive: false, + }, + } +]; + +export {routes}; diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/router/enterprise-app/ent-main-router.js b/zdxt-web-client/zdxt-enforcement-code-app/src/router/enterprise-app/ent-main-router.js index 1bb90702..13223151 100644 --- a/zdxt-web-client/zdxt-enforcement-code-app/src/router/enterprise-app/ent-main-router.js +++ b/zdxt-web-client/zdxt-enforcement-code-app/src/router/enterprise-app/ent-main-router.js @@ -24,12 +24,12 @@ const routes = [ name: "enterpriseQrCode", component: () => import("@/views/enterprise/qrCode.vue"), }, - // 执法监督码 - { - path: "/enterprise/registrationList", - name: "registrationList", - component: () => import("@/views/enterprise/registrationList.vue"), - } + // // 执法监督码 + // { + // path: "/enterprise/registrationList", + // name: "registrationList", + // component: () => import("@/views/enterprise/registrationList.vue"), + // } ]; export {routes}; diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/views/demo/TestEnfDemoList.vue b/zdxt-web-client/zdxt-enforcement-code-app/src/views/demo/TestEnfDemoList.vue new file mode 100644 index 00000000..c4013c4d --- /dev/null +++ b/zdxt-web-client/zdxt-enforcement-code-app/src/views/demo/TestEnfDemoList.vue @@ -0,0 +1,170 @@ + + + + + diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/enterpriseHome.vue b/zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/enterpriseHome.vue index 14125bdc..fcfec021 100644 --- a/zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/enterpriseHome.vue +++ b/zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/enterpriseHome.vue @@ -8,7 +8,9 @@
-
+
+
demo-list
+
- - - - -
- - 全部 - - 本月 - - 本季 - - 本年 - - - - - 筛选 - -
-
- {{ data.dateSearch }} -
- - - - -
- - -
- - -
- -
-
-

执法时间:{{ formattedTimeYYYYmmdd(item.createTime) }}

- -
- - 联 -
-
- - -
-
-
-

{{ item.lawEnforcementItemText }}

-
- -
-

{{ item.bureauDeptName }}

-
- -
-

- - - {{ nameCorrect(item.lawEnforcer) }} - {{ nameCorrect(item)}} - -

-
-
-

{{ item.checkCategoryText }} -

-
-
- - -
- - -
-
-
-
-
-
-
- - - -
- - - - -