feat(吉林演示): 松原

1.天气数据接收定时任务,解决代码扫描问题,修改文件读取相关代码,解决资源未关流问题;
2.修改登录验证码生成工具类,解决代码扫描问题,修复随机数不安全问题;
3.删除除主程序启动类外其他启动类模块,解决代码扫描问题;
4.删除自定义httputlis类,解决代码扫描问题,替换部分代码远程调用方法;
5.重构光伏预测模块下载电站实际发电数据导入模板接口,解决代码扫描问题;
6.重构光伏预测模块导入电站实际发电数据接口,解决代码扫描问题;
7.删除公用excel导入导出工具类及poi相关pom依赖,解决代码扫描问题;
8.光伏功率预测模块,增加查询线路列表接口,解决页面接口报错问题;
9.增加测试用历史数据导入接口;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C02-system/pps-core-system/src/main/java/pps/core/system/service/SysUserWithUserGroupRelService.java

 package pps.core.system.service;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.text.CharSequenceUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import pps.core.common.session.PpsUserSession;
+import pps.core.common.utils.BaseUtils;
 import pps.core.system.entity.SysUserWithUserGroupRelEnt;
 import pps.core.system.entity.SysUserWithUserGroupRelView;
+import pps.core.system.error.LoginError;
 import pps.core.system.mapper.SysUserWithUserGroupRelMapper;
 import pps.core.system.mapper.SysUserWithUserGroupRelViewMapper;
 import pps.core.system.service.data.sys_user_with_user_group_rel.*;
@@ -85,27 +91,33 @@ public class SysUserWithUserGroupRelService {
 
     @XApiPost
     public XServiceResult createSysUserWithUserGroupRel(XContext context, CreateSysUserWithUserGroupRelInput input) {
+        if (CharSequenceUtil.isBlank(input.getUserId()) || CollUtil.isEmpty(input.getUserGroupIdList())) {
+            return XServiceResult.error(context, LoginError.Trade_ParamIsNull);
+        }
         //删除原关系
         SysUserWithUserGroupRelMapper delMapper = context.getBean(SysUserWithUserGroupRelMapper.class);
-        PageHelper.startPage(1, 1000);
-        List<SysUserWithUserGroupRelEnt> sysUserGroupEnts = delMapper.selectList(new QueryWrapper<SysUserWithUserGroupRelEnt>()
-                .lambda()
-                .eq(SysUserWithUserGroupRelEnt::getUserId, input.getUserId()));
-        if (CollUtil.isNotEmpty(sysUserGroupEnts)) {
-            delMapper.deleteBatchIds(sysUserGroupEnts.stream().map(SysUserWithUserGroupRelEnt::getId).collect(Collectors.toList()));
-        }
-        List<SysUserWithUserGroupRelEnt> list = new ArrayList<>();
+        delMapper.delete(new LambdaQueryWrapper<SysUserWithUserGroupRelEnt>()
+                .eq(SysUserWithUserGroupRelEnt::getUserId, input.getUserId())
+        );
+        PpsUserSession session = context.getSession(PpsUserSession.class);
+        String userId = session.getId();
+        String userName = session.getUserName();
+        DateTime now = DateUtil.date();
+        Integer sort = ObjectUtil.defaultIfNull(input.getSort(), 0);
+        List<SysUserWithUserGroupRelView> list = new ArrayList<>(input.getUserGroupIdList().size());
         for (String userGroupId : input.getUserGroupIdList()) {
-            SysUserWithUserGroupRelEnt entity = new SysUserWithUserGroupRelEnt();
+            SysUserWithUserGroupRelView entity = new SysUserWithUserGroupRelView();
+            entity.setId(BaseUtils.randomUUIDString());
             entity.setUserId(input.getUserId());
             entity.setUserGroupId(userGroupId);
-            entity.setSort(input.getSort());
+            entity.setSort(sort);
+            entity.setCreateById(userId);
+            entity.setCreateByName(userName);
+            entity.setCreateTime(now);
             list.add(entity);
         }
-        SysUserWithUserGroupRelMapper mapper = context.getBean(SysUserWithUserGroupRelMapper.class);
-        for (SysUserWithUserGroupRelEnt sysUserWithUserGroupRelEnt : list) {
-            mapper.insert(sysUserWithUserGroupRelEnt);
-        }
+        SysUserWithUserGroupRelViewMapper mapper = context.getBean(SysUserWithUserGroupRelViewMapper.class);
+        mapper.batchInsert(list);
         return XServiceResult.OK;
     }
 

C02-system/pps-core-system/src/main/resources/mybatis/mapper/pps/core/system/SysUserWithUserGroupRelViewMapper.xml

@@ -81,11 +81,11 @@
         user_id=#{userId}
     </select>
     <insert id="batchInsert" parameterType="java.util.List">
-        INSERT INTO sys_user_with_user_group_rel
-        (id, user_id, user_group_id, create_by_id, create_by_name, create_time)
+        INSERT INTO sys_user_with_user_group_rel(id, user_id, user_group_id, sort, create_by_id, create_by_name,
+        create_time)
         VALUES
         <foreach collection="list" item="item" separator=",">
-            (#{item.id}, #{item.userId}, #{item.userGroupId},
+            (#{item.id}, #{item.userId}, #{item.userGroupId}, #{item.sort},
             #{item.createById}, #{item.createByName}, #{item.createTime})
         </foreach>
     </insert>