From 2e478c9fa3226db5b43f721b40f4f8c191d0f722 Mon Sep 17 00:00:00 2001
From: VVT789 <67089238+VVT789@users.noreply.github.com>
Date: 星期一, 17 三月 2025 23:24:29 +0800
Subject: [PATCH] Merge pull request #4 from Andy-Yin/wt_from_develop1.0
---
zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java | 5
zhitan-system/src/main/java/com/zhitan/peakvalley/domain/ElectricityPriceDate.java | 13 +++
zhitan-system/src/main/java/com/zhitan/productoutput/services/impl/ProductOutputServiceImpl.java | 1
zhitan-vue/src/views/modelconfiguration/indexwarehouse/components/statisticalIndicatorManagement/statisticalIndicatorManagement.vue | 2
zhitan-system/src/main/resources/mapper/system/SysRoleMapper.xml | 10 +-
zhitan-admin/src/main/java/com/zhitan/web/controller/model/EnergyIndexController.java | 13 --
zhitan-common/src/main/java/com/zhitan/common/core/domain/entity/SysDictType.java | 11 ++
zhitan-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml | 15 ++-
zhitan-system/src/main/java/com/zhitan/system/service/impl/SysRoleServiceImpl.java | 1
sql/postgre.sql | 2
zhitan-common/src/main/java/com/zhitan/common/enums/IndexType.java | 17 +++
zhitan-system/src/main/resources/mapper/system/SysConfigMapper.xml | 8 +
zhitan-system/src/main/java/com/zhitan/powerDistribution/domain/PowerDistribution.java | 2
zhitan-system/src/main/resources/mapper/system/SysUserMapper.xml | 84 ++++++++++++++++----
zhitan-system/src/main/java/com/zhitan/model/mapper/EnergyIndexMapper.java | 2
zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml | 8 +-
zhitan-vue/.env.development | 3
zhitan-system/src/main/java/com/zhitan/model/service/IEnergyIndexService.java | 2
zhitan-system/src/main/java/com/zhitan/system/mapper/SysRoleMenuMapper.java | 5
19 files changed, 148 insertions(+), 56 deletions(-)
diff --git a/sql/postgre.sql b/sql/postgre.sql
index 81bc1c8..239a8bb 100644
--- a/sql/postgre.sql
+++ b/sql/postgre.sql
@@ -581,6 +581,7 @@
"id" varchar(36) COLLATE "pg_catalog"."default" NOT NULL,
"code" varchar(20) COLLATE "pg_catalog"."default",
"name" varchar(20) COLLATE "pg_catalog"."default",
+ "gateway_key" varchar(255) COLLATE "pg_catalog"."default",
"device_type" varchar(10) COLLATE "pg_catalog"."default",
"unit" varchar(10) COLLATE "pg_catalog"."default",
"create_by" varchar(64) COLLATE "pg_catalog"."default",
@@ -594,6 +595,7 @@
COMMENT ON COLUMN "daq_template"."id" IS '涓婚敭';
COMMENT ON COLUMN "daq_template"."code" IS '鍙傛暟缂栫爜';
COMMENT ON COLUMN "daq_template"."name" IS '鍙傛暟鍚嶇О';
+COMMENT ON COLUMN "daq_template"."gateway_key" IS '閲囬泦缂栫爜';
COMMENT ON COLUMN "daq_template"."device_type" IS '鍙傛暟鎵�灞炵被鍨�';
COMMENT ON COLUMN "daq_template"."unit" IS '鍗曚綅';
COMMENT ON COLUMN "daq_template"."create_by" IS '鍒涘缓鑰�';
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/model/EnergyIndexController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/model/EnergyIndexController.java
index 2ec479d..8d01836 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/model/EnergyIndexController.java
+++ b/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();
}
diff --git a/zhitan-common/src/main/java/com/zhitan/common/core/domain/entity/SysDictType.java b/zhitan-common/src/main/java/com/zhitan/common/core/domain/entity/SysDictType.java
index cbe33e2..5a95c53 100644
--- a/zhitan-common/src/main/java/com/zhitan/common/core/domain/entity/SysDictType.java
+++ b/zhitan-common/src/main/java/com/zhitan/common/core/domain/entity/SysDictType.java
@@ -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;
+ }
}
diff --git a/zhitan-common/src/main/java/com/zhitan/common/enums/IndexType.java b/zhitan-common/src/main/java/com/zhitan/common/enums/IndexType.java
index 26110c3..533f8e0 100644
--- a/zhitan-common/src/main/java/com/zhitan/common/enums/IndexType.java
+++ b/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;
+ }
}
diff --git a/zhitan-system/src/main/java/com/zhitan/model/mapper/EnergyIndexMapper.java b/zhitan-system/src/main/java/com/zhitan/model/mapper/EnergyIndexMapper.java
index 3c02acc..6cc8e11 100644
--- a/zhitan-system/src/main/java/com/zhitan/model/mapper/EnergyIndexMapper.java
+++ b/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);
diff --git a/zhitan-system/src/main/java/com/zhitan/model/service/IEnergyIndexService.java b/zhitan-system/src/main/java/com/zhitan/model/service/IEnergyIndexService.java
index 1f4c23c..1332be0 100644
--- a/zhitan-system/src/main/java/com/zhitan/model/service/IEnergyIndexService.java
+++ b/zhitan-system/src/main/java/com/zhitan/model/service/IEnergyIndexService.java
@@ -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);
diff --git a/zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java
index c519c97..9e37fe4 100644
--- a/zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java
@@ -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
diff --git a/zhitan-system/src/main/java/com/zhitan/peakvalley/domain/ElectricityPriceDate.java b/zhitan-system/src/main/java/com/zhitan/peakvalley/domain/ElectricityPriceDate.java
index 3cd8115..2add55e 100644
--- a/zhitan-system/src/main/java/com/zhitan/peakvalley/domain/ElectricityPriceDate.java
+++ b/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;
+ }
}
diff --git a/zhitan-system/src/main/java/com/zhitan/powerDistribution/domain/PowerDistribution.java b/zhitan-system/src/main/java/com/zhitan/powerDistribution/domain/PowerDistribution.java
index e74f2c3..1c29018 100644
--- a/zhitan-system/src/main/java/com/zhitan/powerDistribution/domain/PowerDistribution.java
+++ b/zhitan-system/src/main/java/com/zhitan/powerDistribution/domain/PowerDistribution.java
@@ -34,4 +34,6 @@
* 璐熻矗浜虹數璇�
*/
private String principalsTel;
+
+ private String remark;
}
diff --git a/zhitan-system/src/main/java/com/zhitan/productoutput/services/impl/ProductOutputServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/productoutput/services/impl/ProductOutputServiceImpl.java
index f2b6829..7a2329a 100644
--- a/zhitan-system/src/main/java/com/zhitan/productoutput/services/impl/ProductOutputServiceImpl.java
+++ b/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;
diff --git a/zhitan-system/src/main/java/com/zhitan/system/mapper/SysRoleMenuMapper.java b/zhitan-system/src/main/java/com/zhitan/system/mapper/SysRoleMenuMapper.java
index 2f209e6..1efb6ca 100644
--- a/zhitan-system/src/main/java/com/zhitan/system/mapper/SysRoleMenuMapper.java
+++ b/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);
}
diff --git a/zhitan-system/src/main/java/com/zhitan/system/service/impl/SysRoleServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/system/service/impl/SysRoleServiceImpl.java
index 8e6338e..cf18c4d 100644
--- a/zhitan-system/src/main/java/com/zhitan/system/service/impl/SysRoleServiceImpl.java
+++ b/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);
}
diff --git a/zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml b/zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml
index 78d0144..279d42f 100644
--- a/zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml
+++ b/zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml
@@ -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">
diff --git a/zhitan-system/src/main/resources/mapper/system/SysConfigMapper.xml b/zhitan-system/src/main/resources/mapper/system/SysConfigMapper.xml
index afb865f..d9c8dbf 100644
--- a/zhitan-system/src/main/resources/mapper/system/SysConfigMapper.xml
+++ b/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>
diff --git a/zhitan-system/src/main/resources/mapper/system/SysRoleMapper.xml b/zhitan-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 8196b75..caf1e1f 100644
--- a/zhitan-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/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>
diff --git a/zhitan-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/zhitan-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
index b929cfb..bbb9b48 100644
--- a/zhitan-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
+++ b/zhitan-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
@@ -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=",">
diff --git a/zhitan-system/src/main/resources/mapper/system/SysUserMapper.xml b/zhitan-system/src/main/resources/mapper/system/SysUserMapper.xml
index 68e0991..da6ae7e 100644
--- a/zhitan-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/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}
diff --git a/zhitan-vue/.env.development b/zhitan-vue/.env.development
index ff211da..8115ffc 100644
--- a/zhitan-vue/.env.development
+++ b/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'
diff --git a/zhitan-vue/src/views/modelconfiguration/indexwarehouse/components/statisticalIndicatorManagement/statisticalIndicatorManagement.vue b/zhitan-vue/src/views/modelconfiguration/indexwarehouse/components/statisticalIndicatorManagement/statisticalIndicatorManagement.vue
index 94799d3..dfc05cc 100644
--- a/zhitan-vue/src/views/modelconfiguration/indexwarehouse/components/statisticalIndicatorManagement/statisticalIndicatorManagement.vue
+++ b/zhitan-vue/src/views/modelconfiguration/indexwarehouse/components/statisticalIndicatorManagement/statisticalIndicatorManagement.vue
@@ -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>
--
Gitblit v1.9.3