Merge branch 'master' of http://116.63.33.55/git/read_opc

chuanyi_server/src/main/java/com/judong/chuanyiserver/dao/DepartmentDao.java

@@ -103,4 +103,9 @@ public interface DepartmentDao {
      */
     Department queryParentDepartmentById(Integer departmentParentId);
 
+    /**
+     * 删除部门用户信息
+     */
+    Integer deleteDepartmentUserByIdList(@Param("idList") List<Integer> IdList);
+
 }

chuanyi_server/src/main/java/com/judong/chuanyiserver/dao/RawDataDao.java

@@ -20,5 +20,5 @@ public interface RawDataDao {
 
     List<Map<String, Object>> getPieData(Integer itemGroupId, Integer remainder, Integer dataSourceId, List<Item> itemList);
 
-    List<Map<String, Object>> getTableDataEavg(int itemGroupId, Integer remainder, String itemName, Integer dataSourceId);
+    List<Map<String, Object>> getTableDataEvery(int itemGroupId, Integer remainder, String itemName, Integer dataSourceId,String sqlParameter);
 }

chuanyi_server/src/main/java/com/judong/chuanyiserver/dao/RoleDao.java

@@ -170,4 +170,9 @@ public interface RoleDao {
      */
     Integer deleteUserRoleByUserIdList( @Param("userIdList") List<String> userIdList);
 
+    /**
+     * 删除角色以及对应的相关信息
+     */
+    Integer deleteRoleList(@Param("roleIdList") List<Integer> roleIdList);
+
 }

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/impl/DepartmentServiceImpl.java

@@ -116,6 +116,7 @@ public class DepartmentServiceImpl implements DepartmentService {
                 return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "删除失败，请检查所选部门是否存在成员或下级部门");
             }
         }
+        departmentDao.deleteDepartmentUserByIdList(id);
         Integer count = departmentDao.isDeleteByid(id);
         return Result.ok(count);
     }

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/impl/RawDataServiceImpl.java

@@ -138,7 +138,11 @@ public class RawDataServiceImpl implements RawDataService {
             List<Map<String, Object>> tableDataList = new ArrayList<>();
             if (tableDataDto.getReportValueFormat() == ConstantStr.EVERY_DAY_ES) {
                 if (itemGroup.getValueCondition() == ConstantStr.AVERAGE_VALUE) {
-                    tableDataList = rawDataDao.getTableDataEavg(itemGroupId, remainder, itemName, itemGroup.getDataSourceId());
+                    tableDataList = rawDataDao.getTableDataEvery(itemGroupId, remainder, itemName, itemGroup.getDataSourceId(), ConstantStr.AVERAGE_VALUE_PAR);
+                } else if (itemGroup.getValueCondition() == ConstantStr.MAX_VALUE) {
+                    tableDataList = rawDataDao.getTableDataEvery(itemGroupId, remainder, itemName, itemGroup.getDataSourceId(), ConstantStr.MAX_VALUE_PAR);
+                } else if (itemGroup.getValueCondition() == ConstantStr.MIN_VALUE) {
+                    tableDataList = rawDataDao.getTableDataEvery(itemGroupId, remainder, itemName, itemGroup.getDataSourceId(), ConstantStr.MIN_VALUE_PAR);
                 } else {
                     throw new CustomException(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "目前还未适配此种类型数据组的取值条件");
                 }
@@ -154,7 +158,7 @@ public class RawDataServiceImpl implements RawDataService {
             } else if (dataSourceType.getDataSourceTypeKey().equals(DataSourceTypeEnum.OPC_DA_REAL.getValue()) ||
                     dataSourceType.getDataSourceTypeKey().equals(DataSourceTypeEnum.OPC_HDA_HISTORY.getValue()) ||
                     dataSourceType.getDataSourceTypeKey().equals(DataSourceTypeEnum.OPC_AE_ALARMS.getValue())) {
-
+                item = itemGroupDao.getItemByKepGroupIdName(itemGroupId, itemName);
             } else if (dataSourceType.getDataSourceTypeKey().equals(DataSourceTypeEnum.KEP_SERVER_REAL.getValue())) {
                 item = itemGroupDao.getItemByKepGroupIdName(itemGroupId, itemName);
             } else {

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/impl/RoleServiceImpl.java

@@ -150,6 +150,7 @@ public class RoleServiceImpl implements RoleService {
         if (roleDao.queryUserNumByRoleIdList(roleIdList)>0){
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "无法删除！请检查所选角色是否已分配用户");
         }
+        roleDao.deleteRoleList(roleIdList);
         roleDao.deleteRoleIdList(roleIdList);
         return Result.ok("删除角色成功");
     }
@@ -232,7 +233,7 @@ public class RoleServiceImpl implements RoleService {
     public Result queryMenuByUserId(String userId) {
         List<Menu> menuList = roleDao.queryMenuByUserId(userId);
         if (Blank.isEmpty(menuList)){
-            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(),"用户暂无菜单");
+            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(),"用户暂未分配菜单");
         }
         for (Menu m:menuList){
             List<Menu> menuChildren = menuChildren(m.getId(), userId);

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/impl/UserServiceImpl.java

@@ -500,7 +500,6 @@ public class UserServiceImpl implements UserService {
         if (userDao.updateUserListState(userId,ConstantStr.TOMBSTONE) <= 0){
             return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "删除用户失败");
         }
-        roleDao.deleteUserRoleByUserIdList(userId);
         return Result.ok("删除用户成功");
     }
 

chuanyi_server/src/main/java/com/judong/chuanyiserver/util/ConstantStr.java

@@ -69,6 +69,11 @@ public class ConstantStr {
     public static final Integer MAX_VALUE = 1;
     public static final Integer MIN_VALUE = 2;
     public static final Integer INSTANTANEOUS_VALUE = 3;
+    //取值条件对应的参数
+    public static final String AVERAGE_VALUE_PAR = "avg";
+    public static final String MAX_VALUE_PAR = "max";
+    public static final String MIN_VALUE_PAR = "min";
+//    public static final String INSTANTANEOUS_VALUE_PAR = "avg";
 
     //报表取值格式
     //每天的08:00到第二天的07:00

chuanyi_server/src/main/resources/mapper/DepartmentDao.xml

@@ -119,7 +119,9 @@
     </select>
 
     <select id="queryUserDepartmentById" resultType="java.lang.Integer">
-        SELECT COUNT(*) FROM sys_user_department WHERE department_id=#{id}
+        SELECT COUNT(*) FROM sys_user WHERE user_id IN
+        (SELECT user_id FROM sys_user_department WHERE department_id=#{id})
+        AND state !=2
     </select>
 
     <insert id="addUserDepartment">
@@ -163,4 +165,11 @@
         WHERE id=#{departmentParentId} and is_delete=0
     </select>
 
+    <delete id="deleteDepartmentUserByIdList">
+        DELETE  FROM sys_user_department WHERE department_id IN
+        <foreach collection="idList" open="(" close=")" separator="," item="id">
+            #{id}
+        </foreach>
+    </delete>
+
 </mapper>

chuanyi_server/src/main/resources/mapper/RawDataDao.xml

@@ -61,14 +61,7 @@
         a ORDER BY a.item_name,a.create_time
     </select>
 
-    <select id="getTableDataEavg" resultType="java.util.Map">
-        SELECT data_value
-        FROM t_raw_data${remainder}
-        WHERE item_group_id = #{itemGroupId}
-          AND item_name = #{itemName}
-          AND data_source_id = #{dataSourceId}
-        order by create_time
-        LIMIT 10;
+    <select id="getTableDataEvery" resultType="java.util.Map">
         SELECT
         IF
         (
@@ -135,13 +128,13 @@
         LEFT JOIN ((
         SELECT HOUR
         ( create_time ) AS data_hour,
-        avg( data_value ) AS data_val
+        ${sqlParameter}( data_value ) AS data_val
         FROM
         t_raw_data${remainder}
         WHERE
         item_group_id = #{itemGroupId}
-        AND item_name = #{itemName}
         AND data_source_id = #{dataSourceId}
+        AND item_name = #{itemName}
         AND date_format( create_time, '%Y-%m-%d' )= date_format( now(), '%Y-%m-%d' )
         AND date_format( create_time, '%Y-%m-%d %H' ) &lt;= concat( date_format( now(), '%Y-%m-%d ' ), '07' )
         GROUP BY
@@ -150,13 +143,13 @@
         (
         SELECT HOUR
         ( create_time ),
-        avg( data_value )
+        ${sqlParameter}( data_value )
         FROM
         t_raw_data${remainder}
         WHERE
         item_group_id = #{itemGroupId}
-        AND item_name = #{itemName}
         AND data_source_id = #{dataSourceId}
+        AND item_name = #{itemName}
         AND date_format( create_time, '%Y-%m-%d' )= date_format( CURRENT_DATE ()- 1, '%Y-%m-%d' )
         AND date_format( create_time, '%Y-%m-%d %H' ) &gt;= concat( date_format( CURRENT_DATE ()- 1, '%Y-%m-%d ' ), '08' )
         GROUP BY

chuanyi_server/src/main/resources/mapper/RoleDao.xml

@@ -231,7 +231,7 @@
     <select id="queryMenuByUserId" resultType="com.judong.chuanyiserver.entity.Menu">
         SELECT id,parent_id,menu_name,menu_url,menu_icon,sort_num,menu_status,create_time,update_time,hidden FROM sys_menu WHERE id
         IN(SELECT DISTINCT(menu_id) FROM sys_role_menu WHERE role_id IN
-        (SELECT role_id FROM sys_user_role WHERE user_id=#{userId}))
+        (SELECT id FROM sys_role WHERE id IN (SELECT role_id FROM sys_user_role WHERE user_id=#{userId}) AND is_delete = 0))
         AND parent_id=0 AND menu_status=1
     </select>
 
@@ -344,10 +344,12 @@
     </select>
 
     <select id="queryUserNumByRoleIdList" resultType="java.lang.Integer">
-        SELECT COUNT(*) FROM sys_user_role WHERE role_id IN
+        SELECT COUNT(*) FROM sys_user WHERE user_id IN
+        (SELECT user_id FROM sys_user_role WHERE role_id IN
         <foreach collection="roleIdList" item="roleId" separator="," open="(" close=")">
             #{roleId}
-        </foreach>
+        </foreach>)
+        AND state !=2
     </select>
 
     <delete id="deleteUserRoleByUserIdList">
@@ -357,4 +359,11 @@
         </foreach>
     </delete>
 
+    <delete id="deleteRoleList">
+        DELETE  FROM sys_user_role WHERE role_id in
+        <foreach collection="roleIdList" open="(" close=")" separator="," item="roleId">
+            #{roleId}
+        </foreach>
+    </delete>
+
 </mapper>

chuanyi_server/src/main/resources/mapper/UserDao.xml

@@ -105,7 +105,7 @@
         select sr.id, sr.role_name, sr.role_code
         from sys_role sr
                  inner join sys_user_role sur on sr.id = sur.role_id
-        where sur.user_id = #{userId}
+        where sur.user_id = #{userId} and sr.is_delete = 0
     </select>
     <select id="getUserCount" resultType="java.lang.Long">
         select count(*)
@@ -227,7 +227,7 @@
     </update>
 
     <select id="queryUserName" resultType="java.lang.Integer">
-        SELECT count(*) FROM sys_user WHERE BINARY user_name=#{name} and state!=2
+        SELECT count(*) FROM sys_user WHERE BINARY user_name=#{name}
     </select>
 
     <select id="getUserByNamePassByUpdate" resultType="com.judong.chuanyiserver.entity.User">