zhitan-admin/src/main/java/com/zhitan/web/controller/model/EnergyIndexController.java
@@ -126,25 +126,18 @@ */ @PreAuthorize("@ss.hasPermi('energyindex:energyindex:remove')") @Log(title = "指标信息", businessType = BusinessType.DELETE) @DeleteMapping("/{nodeId}/{indexIds}") public AjaxResult remove(@PathVariable String nodeId, @PathVariable String[] indexIds) { @DeleteMapping("/{indexIds}") public AjaxResult remove(@PathVariable String[] indexIds) { List<EnergyIndex> energyIndexList = energyIndexService.getEnergyIndexByIds( Arrays.asList(indexIds)); List<String> deleteIds = energyIndexList.stream() .filter(f -> StringUtils.isBlank(f.getMeterId())) .map(EnergyIndex::getIndexId) .collect(Collectors.toList()); List<String> removeLink = energyIndexList.stream() .filter(f -> StringUtils.isNotBlank(f.getMeterId())) .map(EnergyIndex::getIndexId) .collect(Collectors.toList()); if (!removeLink.isEmpty()) { energyIndexService.removeNodeIndex(nodeId, removeLink); energyIndexService.removeNodeIndex(removeLink); } if (!deleteIds.isEmpty()) { energyIndexService.deleteEnergyIndexByIds(nodeId, deleteIds.toArray(new String[0])); } return AjaxResult.success(); }
@@ -37,6 +37,7 @@ /** 状态（0正常 1停用） */ @Excel(name = "状态", readConverterExp = "0=正常,1=停用") private String status; private String remark; public Long getDictId() { @@ -97,4 +98,14 @@ .append("remark", getRemark()) .toString(); } @Override public String getRemark() { return remark; } @Override public void setRemark(String remark) { this.remark = remark; } } zhitan-common/src/main/java/com/zhitan/common/enums/IndexType.java
@@ -4,9 +4,22 @@ /** * 采集指标 */ COLLECT, COLLECT("COLLECT"), /** * 统计指标 */ STATISTIC STATISTIC("STATISTIC"); private final String description; IndexType(String description) { this.description = description; } public String getDescription() { return description; } } zhitan-system/src/main/java/com/zhitan/model/mapper/EnergyIndexMapper.java
@@ -89,7 +89,7 @@ List<EnergyIndex> selectEnergyIndex(EnergyIndexQuery query); void removeNodeIndex(@Param("nodeId")String nodeId, @Param("indexIds")List<String> indexIds); void removeEnergyIndex(@Param("indexIds")List<String> indexIds); void saveEnergyIndex(List<EnergyIndex> insertData);
@@ -103,7 +103,7 @@ List<EnergyIndex> searchIndexByNodeAndChildrenNode(String nodeId, String filter); void removeNodeIndex(String nodeId, List<String> removeLink); void removeNodeIndex(List<String> removeLink); AjaxResult importEnergyIndex(List<EnergyIndex> energyIndexList, boolean updateSupport);
@@ -1,7 +1,6 @@ package com.zhitan.model.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhitan.basicdata.domain.MeterImplement; import com.zhitan.basicdata.services.IMeterImplementService; @@ -212,8 +211,8 @@ } @Override public void removeNodeIndex(String nodeId, List<String> removeLink) { energyIndexMapper.removeNodeIndex(nodeId, removeLink); public void removeNodeIndex(List<String> removeLink) { energyIndexMapper.removeEnergyIndex(removeLink); } @Override zhitan-system/src/main/java/com/zhitan/peakvalley/domain/ElectricityPriceDate.java
@@ -32,6 +32,9 @@ @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") private Date endDate; private String remark; // /** 是否阶梯价格0否1是 */ // @Excel(name = "是否阶梯价格0否1是") // private String type; @@ -121,4 +124,14 @@ .append("remark", getRemark()) .toString(); } @Override public String getRemark() { return remark; } @Override public void setRemark(String remark) { this.remark = remark; } } zhitan-system/src/main/java/com/zhitan/powerDistribution/domain/PowerDistribution.java
@@ -34,4 +34,6 @@ * 负责人电话 */ private String principalsTel; private String remark; } zhitan-system/src/main/java/com/zhitan/productoutput/services/impl/ProductOutputServiceImpl.java
@@ -101,6 +101,7 @@ wrapper.like(StringUtils.isNotEmpty(productOutput.getDataTime()),ProductOutput::getDataTime,productOutput.getDataTime()); wrapper.eq(StringUtils.isNotEmpty(productOutput.getProductType()),ProductOutput::getProductType,productOutput.getProductType()); wrapper.eq(StringUtils.isNotEmpty(productOutput.getNodeId()),ProductOutput::getNodeId,productOutput.getNodeId()); wrapper.eq(StringUtils.isNotEmpty(productOutput.getTimeType()),ProductOutput::getTimeType,productOutput.getTimeType()); wrapper.orderByDesc(ProductOutput::getCreateTime); Page<ProductOutput> page = productOutputMapper.selectPage(new Page<ProductOutput>(pageNum, pageSize), wrapper); return page; zhitan-system/src/main/java/com/zhitan/system/mapper/SysRoleMenuMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zhitan.system.domain.SysRoleMenu; import org.apache.ibatis.annotations.Param; /** * 角色与菜单关联表 数据层 @@ -34,7 +35,7 @@ * @param ids 需要删除的数据ID * @return 结果 */ int deleteRoleMenu(Long[] ids); int deleteRoleMenu(@Param("ids") Long[] ids); /** * 批量新增角色菜单信息 @@ -42,5 +43,5 @@ * @param roleMenuList 角色菜单列表 * @return 结果 */ int batchRoleMenu(List<SysRoleMenu> roleMenuList); int batchRoleMenu(@Param("list") List<SysRoleMenu> roleMenuList); } zhitan-system/src/main/java/com/zhitan/system/service/impl/SysRoleServiceImpl.java
@@ -433,6 +433,7 @@ DateUtils.parseDate(role.getParams().get("beginTime")), DateUtils.parseDate(role.getParams().get("endTime"))); } queryWrapper.eq(SysRole::getDelFlag, 0); return roleMapper.selectPage(new Page<SysRole>(pageNum,pageSize),queryWrapper); }
@@ -303,11 +303,11 @@ from energy_index where meter_id = #{meterId} </delete> <delete id="removeNodeIndex"> delete from node_index where node_id = #{nodeId} and index_id in <foreach item="indexId" collection="indexIds" open="(" separator="," close=")"> <delete id="removeEnergyIndex"> delete from energy_index where index_id in <foreach collection="indexIds" item="indexId" open="(" separator="," close=")"> #{indexId} </foreach>; </foreach> </delete> <select id="getEnergyIndexMeterByCodes" resultMap="EnergyIndexResult"> zhitan-system/src/main/resources/mapper/system/SysConfigMapper.xml
@@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.zhitan.system.mapper.SysConfigMapper"> <resultMap type="SysConfig" id="SysConfigResult"> <resultMap type="com.zhitan.system.domain.SysConfig" id="SysConfigResult"> <id property="configId" column="config_id" /> <result property="configName" column="config_name" /> <result property="configKey" column="config_key" /> @@ -63,7 +63,11 @@ <include refid="selectConfigVo"/> where config_key = #{configKey} </select> <select id="selectConfigById" resultType="com.zhitan.system.domain.SysConfig"> <include refid="selectConfigVo"/> where config_id = #{configId} </select> <insert id="insertConfig" parameterType="SysConfig"> insert into sys_config ( <if test="configName != null and configName != '' ">config_name,</if> zhitan-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.zhitan.system.mapper.SysRoleMapper"> <resultMap type="SysRole" id="SysRoleResult"> <resultMap type="com.zhitan.common.core.domain.entity.SysRole" id="SysRoleResult"> <id property="roleId" column="role_id" /> <result property="roleName" column="role_name" /> <result property="roleKey" column="role_key" /> @@ -30,7 +30,7 @@ left join sys_dept d on u.dept_id = d.dept_id </sql> <select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult"> <select id="selectRoleList" parameterType="com.zhitan.common.core.domain.entity.SysRole" resultMap="SysRoleResult"> <include refid="selectRoleVo"/> where r.del_flag = '0' <if test="roleId != null and roleId != 0"> @@ -94,7 +94,7 @@ where r.role_key=#{roleKey} and r.del_flag = '0' limit 1 </select> <insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId"> <insert id="insertRole" parameterType="com.zhitan.common.core.domain.entity.SysRole" useGeneratedKeys="true" keyProperty="roleId"> insert into sys_role( <if test="roleId != null and roleId != 0">role_id,</if> <if test="roleName != null and roleName != ''">role_name,</if> @@ -122,7 +122,7 @@ ) </insert> <update id="updateRole" parameterType="SysRole"> <update id="updateRole" parameterType="com.zhitan.common.core.domain.entity.SysRole"> update sys_role <set> <if test="roleName != null and roleName != ''">role_name = #{roleName},</if> @@ -139,7 +139,7 @@ where role_id = #{roleId} </update> <update id="updateRoleStatus" parameterType="SysRole"> <update id="updateRoleStatus" parameterType="com.zhitan.common.core.domain.entity.SysRole"> update sys_user set status = #{status} where user_id = #{userId} </update>
@@ -4,9 +4,9 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.zhitan.system.mapper.SysRoleMenuMapper"> <resultMap type="SysRoleMenu" id="SysRoleMenuResult"> <result property="roleId" column="role_id" /> <result property="menuId" column="menu_id" /> <resultMap type="com.zhitan.system.domain.SysRoleMenu" id="SysRoleMenuResult"> <result property="roleId" column="role_id"/> <result property="menuId" column="menu_id"/> </resultMap> <select id="checkMenuExistRole" resultType="Integer"> @@ -16,7 +16,14 @@ <delete id="deleteRoleMenuByRoleId" parameterType="Long"> delete from sys_role_menu where role_id=#{roleId} </delete> <delete id="deleteRoleMenu" parameterType="arraylist"> delete from sys_role_menu where role_id in ( <foreach collection="ids" item="roleId" separator=","> #{roleId} </foreach> ) </delete> <insert id="batchRoleMenu"> insert into sys_role_menu(role_id, menu_id) values <foreach item="item" index="index" collection="list" separator=","> zhitan-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.zhitan.system.mapper.SysUserMapper"> <resultMap type="SysUser" id="SysUserResult"> <resultMap type="com.zhitan.common.core.domain.entity.SysUser" id="SysUserResult"> <id property="userId" column="user_id"/> <result property="deptId" column="dept_id"/> <result property="userName" column="user_name"/> @@ -24,21 +24,21 @@ <result property="updateTime" column="update_time"/> <result property="remark" column="remark"/> <result property="singleUser" column="single_user"/> <association property="dept" javaType="SysDept" resultMap="deptResult" /> <association property="dept" javaType="com.zhitan.common.core.domain.entity.SysDept" resultMap="deptResult"/> <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/> </resultMap> <resultMap id="deptResult" type="SysDept"> <resultMap id="deptResult" type="com.zhitan.common.core.domain.entity.SysDept"> <id property="deptId" column="dept_id"/> <result property="parentId" column="parent_id"/> <result property="deptName" column="dept_name"/> <result property="ancestors" column="ancestors" /> <result property="ancestors" column="ancestors"/> <result property="orderNum" column="order_num"/> <result property="leader" column="leader"/> <result property="status" column="dept_status"/> </resultMap> <resultMap id="RoleResult" type="SysRole"> <resultMap id="RoleResult" type="com.zhitan.common.core.domain.entity.SysRole"> <id property="roleId" column="role_id"/> <result property="roleName" column="role_name"/> <result property="roleKey" column="role_key"/> @@ -84,9 +84,10 @@ left join sys_role r on r.role_id = ur.role_id </sql> <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult"> <select id="selectUserList" parameterType="com.zhitan.common.core.domain.entity.SysUser" resultMap="SysUserResult"> select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phone_number, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.single_user, d.dept_name, d.leader from u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.single_user, d.dept_name, d.leader from sys_user u left join sys_dept d on u.dept_id = d.dept_id where u.del_flag = '0' @@ -115,7 +116,7 @@ <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult"> <include refid="selectUserVo"/> where u.user_name = #{userName} and u.del_flag = '0' where u.user_name = #{userName} and u.del_flag = '0' </select> <select id="selectUserById" parameterType="Long" resultMap="SysUserResult"> @@ -123,19 +124,64 @@ where u.user_id = #{userId} </select> <select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult"> select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1 <select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult"> select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1 </select> <select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult"> select user_id, phone_number from sys_user where phone_number = #{phoneNumber} and del_flag = '0' limit 1 select user_id, phone_number from sys_user where phone_number = #{phoneNumber} and del_flag = '0' limit 1 </select> <select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult"> select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1 select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1 </select> <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId"> <select id="selectAllocatedList" parameterType="com.zhitan.common.core.domain.entity.SysUser" resultMap="SysUserResult"> select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phone_number, u.status, u.create_time from sys_user u left join sys_dept d on u.dept_id = d.dept_id left join sys_user_role ur on u.user_id = ur.user_id left join sys_role r on r.role_id = ur.role_id where u.del_flag = '0' and r.role_id = #{roleId} <if test="userName != null and userName != ''"> AND u.user_name like concat('%', #{userName}, '%') </if> <if test="phoneNumber != null and phoneNumber != ''"> AND u.phone_number like concat('%', #{phoneNumber}, '%') </if> <!-- 数据范围过滤 --> ${params.dataScope} </select> <select id="selectUnallocatedList" parameterType="com.zhitan.common.core.domain.entity.SysUser" resultMap="SysUserResult"> select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phone_number, u.status, u.create_time from sys_user u left join sys_dept d on u.dept_id = d.dept_id left join sys_user_role ur on u.user_id = ur.user_id left join sys_role r on r.role_id = ur.role_id where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL) and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId}) <if test="userName != null and userName != ''"> AND u.user_name like concat('%', #{userName}, '%') </if> <if test="phoneNumber != null and phoneNumber != ''"> AND u.phone_number like concat('%', #{phoneNumber}, '%') </if> <!-- 数据范围过滤 --> ${params.dataScope} </select> <insert id="insertUser" parameterType="com.zhitan.common.core.domain.entity.SysUser" useGeneratedKeys="true" keyProperty="userId"> insert into sys_user( <if test="userId != null and userId != 0">user_id,</if> <if test="deptId != null and deptId != 0">dept_id,</if> @@ -169,14 +215,14 @@ ) </insert> <update id="updateUser" parameterType="SysUser"> <update id="updateUser" parameterType="com.zhitan.common.core.domain.entity.SysUser"> update sys_user <set> <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if> <if test="userName != null and userName != ''">user_name = #{userName},</if> <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if> <if test="email != null ">email = #{email},</if> <if test="phoneNumber != null ">phone_number = #{phoneNumber},</if> <if test="email != null ">email = #{email},</if> <if test="phoneNumber != null ">phone_number = #{phoneNumber},</if> <if test="sex != null and sex != ''">sex = #{sex},</if> <if test="avatar != null and avatar != ''">avatar = #{avatar},</if> <if test="password != null and password != ''">password = #{password},</if> @@ -191,19 +237,19 @@ where user_id = #{userId} </update> <update id="updateUserStatus" parameterType="SysUser"> <update id="updateUserStatus" parameterType="com.zhitan.common.core.domain.entity.SysUser"> update sys_user set status = #{status} where user_id = #{userId} </update> <update id="updateUserAvatar" parameterType="SysUser"> <update id="updateUserAvatar" parameterType="com.zhitan.common.core.domain.entity.SysUser"> update sys_user set avatar = #{avatar} where user_name = #{userName} </update> <update id="resetUserPwd" parameterType="SysUser"> <update id="resetUserPwd" parameterType="com.zhitan.common.core.domain.entity.SysUser"> update sys_user set password = #{password} where user_name = #{userName} zhitan-vue/.env.development
@@ -6,6 +6,5 @@ # 系统/开发环境 # test VITE_APP_BASE_API = 'http://139.159.201.118:8201' # hangmingjun VITE_APP_BASE_API = 'http://127.0.0.1:8080'
@@ -2,7 +2,7 @@ <div class="page-box"> <div class="form-card"> <el-form :model="form" ref="queryRef" :inline="true" label-width="70px"> <el-form-item label="编码" prop="indexCategory"> <el-form-item label="指标分类" prop="indexCategory"> <el-select v-model="form.indexCategory" placeholder="请选择指标分类" style="width: 200px"> <el-option v-for="dict in sys_index_category" :key="dict.value" :label="dict.label" :value="dict.value" /> </el-select>
