From 67aab76b35f0ddb5c8b71313b81fa8867770a763 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 26 六月 2024 21:08:05 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java | 8 --
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java | 30 +++---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/config/WebListenerConfiguration.java | 11 --
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/config/WebListenerConfiguration.java | 12 ---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaBlockMapper.java | 3
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/config/WebListenerConfiguration.java | 11 --
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/config/WebListenerConfiguration.java | 2
/dev/null | 61 ---------------
pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/config/WebListenerConfiguration.java | 11 --
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java | 3
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/config/WebListenerConfiguration.java | 12 ---
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java | 4
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java | 19 ----
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/config/WebListenerConfiguration.java | 11 --
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/config/WebListenerConfiguration.java | 12 ---
16 files changed, 22 insertions(+), 190 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java
index dc2abe8..e81594f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java
@@ -53,29 +53,29 @@
/**
* 鍒嗘瀽鐘舵�佷笌鎶ヨ
- * @param bs
- * @param index
+ * @param bs 涓婃姤鏁版嵁鐨勫瓧鑺傛暟缁�
+ * @param index 褰撳墠瑙ｆ瀽鏁扮粍涓嬫爣浣嶇疆
* @return
*/
public static void parseAlarmAndState(byte[] bs, int index, AlarmVo vo){
byte b = bs[index] ;
vo.statePump = (byte)(b & 0x1) ;
- vo.alarmWaterRemain = (byte)(b >> 1 & 1) ;
- vo.alarm0WaterRemain = (byte)(b >> 2 & 1) ;
- vo.alarmExceedYear = (byte)(b >> 3 & 1) ;
- vo.alarmWaterMeterFault = (byte)(b >> 4 & 1) ;
- vo.alarmSteal = (byte)(b >> 5 & 1) ;
- vo.alarmWaterMeterBreak = (byte)(b >> 6 & 1) ;
- vo.alarmEleMeterFault = (byte)(b >> 7 & 1) ;
+ vo.alarmWaterRemain = (byte)((b >> 1) & 1) ;
+ vo.alarm0WaterRemain = (byte)((b >> 2) & 1) ;
+ vo.alarmExceedYear = (byte)((b >> 3) & 1) ;
+ vo.alarmWaterMeterFault = (byte)((b >> 4) & 1) ;
+ vo.alarmSteal = (byte)((b >> 5) & 1) ;
+ vo.alarmWaterMeterBreak = (byte)((b >> 6) & 1) ;
+ vo.alarmEleMeterFault = (byte)((b >> 7) & 1) ;
b = bs[index + 1] ;
vo.alarm0MoneyRemain = (byte)(b & 0x1) ;
- vo.alarmInnerDoor = (byte)(b >> 1 & 1) ;
- vo.alarmOuterDoor = (byte)(b >> 2 & 1) ;
- vo.alarmEleMiss = (byte)(b >> 3 & 1) ;
- vo.alarmEleExceed = (byte)(b >> 4 & 1) ;
- vo.alarmEleLowVolt = (byte)(b >> 5 & 1) ;
- vo.stateIcEnable = (byte)(b >> 6 & 1) ;
+ vo.alarmInnerDoor = (byte)((b >> 1) & 1) ;
+ vo.alarmOuterDoor = (byte)((b >> 2) & 1) ;
+ vo.alarmEleMiss = (byte)((b >> 3) & 1) ;
+ vo.alarmEleExceed = (byte)((b >> 4) & 1) ;
+ vo.alarmEleLowVolt = (byte)((b >> 5) & 1) ;
+ vo.stateIcEnable = (byte)((b >> 6) & 1) ;
}
public static String parseTp(byte[] bs, short index){
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java
index f2e5c50..d981669 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java
@@ -1306,8 +1306,7 @@
public static long BCD2Long_LE(byte[] b, int startIndex, int endIndex)throws Exception {
String str = "";
str = decodeBCD_LE(b, startIndex, endIndex - startIndex + 1);
- long n = Long.parseLong(str);
- return n;
+ return Long.parseLong(str);
}
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaBlockMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaBlockMapper.java
index 6316a23..6c4af43 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaBlockMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaBlockMapper.java
@@ -2,10 +2,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoBa.BaBlock;
-import com.dy.pipIrrGlobal.pojoBa.BaClientType;
-import com.dy.pipIrrGlobal.pojoBa.BaPrivilege;
import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaPrivilegeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaPrivilegeMapper.java
deleted file mode 100644
index 9c9cca4..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaPrivilegeMapper.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.dy.pipIrrGlobal.daoBa;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dy.pipIrrGlobal.pojoBa.BaPrivilege;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface BaPrivilegeMapper extends BaseMapper<BaPrivilege> {
-
- /**
- * 鏌ヨ鍏ㄩ儴
- * @return List<BaPrivilege>
- */
- List<BaPrivilege> selectAll() ;
-
- /**
- * 鏌ヨ鏌愪釜鐢ㄦ埛鎵�闅跺睘鎵�鏈夎鑹茬殑鎵�鏈夋潈闄�
- * @param userId 鐢ㄦ埛ID
- * @return List<Integer>
- */
- List<Integer> selectPrivilegeByUserId(@Param("userId") Long userId) ;
-
- /**
- * 鏌ヨ鏌愪釜瑙掕壊鎵�闅跺睘浜庤瑙掕壊鐨勬墍鏈夋潈闄�
- * @param roleId 鐢ㄦ埛ID
- * @return List<Integer>
- */
- List<Integer> selectPrivilegeByRoleId(@Param("roleId") Long roleId) ;
-
- /**
- * insert record to table
- * @param record the record
- * @return insert count
- */
- int putin(BaPrivilege record);
-
- /**
- * insert record to table selective
- * @param record the record
- * @return insert count
- */
- int insertSelective(BaPrivilege record);
-
-}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePrivilegeMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePrivilegeMapper.java
deleted file mode 100644
index ea41c94..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaRolePrivilegeMapper.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.dy.pipIrrGlobal.daoBa;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dy.pipIrrGlobal.pojoBa.BaRolePrivilege;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-@Mapper
-public interface BaRolePrivilegeMapper extends BaseMapper<BaRolePrivilege> {
-
- /**
- * insert record to table
- * @param record the record
- * @return insert count
- */
- int putin(BaRolePrivilege record);
-
- /**
- * insert record to table selective
- * @param record the record
- * @return insert count
- */
- int insertSelective(BaRolePrivilege record);
-
- /**
- * delete by primary key
- * @param roleId primaryKey
- * @param privilegeId primaryKey
- * @return deleteCount
- */
- int deleteByPrimaryKey(@Param("roleId") Long roleId, @Param("privilegeId") Long privilegeId);
-
- /**
- * delete by roleId
- * @param roleId 瑙掕壊ID
- * @return deleteCount
- */
- int deleteByRoleId(@Param("roleId") Long roleId);
-
- /**
- * delete by roleId
- * @param privilegeId 鏉冮檺ID
- * @return deleteCount
- */
- int deleteByPrivilegeId(@Param("privilegeId") Long privilegeId);
-
-}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaPrivilege.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaPrivilege.java
deleted file mode 100644
index bbedf86..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaPrivilege.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.dy.pipIrrGlobal.pojoBa;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-
-/**
- * 鏉冮檺瀹炰綋
- */
-@TableName(value="ba_privilege", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(name = "鏉冮檺瀹炰綋")
-public class BaPrivilege implements BaseEntity {
-
- public static final long serialVersionUID = 202310211551001L;
-
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
- private Long id;
- /**
- * 鏉冮檺缂栧彿
- */
- public Integer num;
- /**
- * 鏉冮檺鍚嶇О
- */
- public String name;
- /**
- * 鏉冮檺绫诲埆
- */
- public String type;
-
-}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java
deleted file mode 100644
index ccf3c1a..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.dy.pipIrrGlobal.pojoBa;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.dy.common.po.BaseEntity;
-import lombok.*;
-/**
- * 瑙掕壊涓庢潈闄愬叧绯诲疄浣�
- */
-@TableName(value="ba_role_privilege", autoResultMap = true)
-@Data
-@Builder
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-public class BaRolePrivilege implements BaseEntity {
-
- public static final long serialVersionUID = 202311062027001L;
-
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableField(value = "roleId")
- public Long roleId;
-
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableField(value = "privilegeId")
- public Long privilegeId;
-
-}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
index a5bdf48..7f54c34 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
@@ -127,14 +127,6 @@
public List<?> roleList ;
/**
- * 鐢ㄦ埛鎵�鎷ユ湁鐨勬潈闄愶紝閽堝鐧诲綍搴旂敤
- */
- @Schema(hidden = true)
- @TableField(exist = false)
- @JSONField(serialize = false)
- public List<Integer> privileges;
-
- /**
* 鎵�灞炵墖鍖哄悕绉�
*/
@Schema(description = "鎵�灞炵墖鍖哄悕绉帮紝鐢ㄤ簬鏄剧ず锛岃〃鍗曚笉鐢ㄥ～鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml
deleted file mode 100644
index 6af6bd3..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaPrivilegeMapper.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pipIrrGlobal.daoBa.BaPrivilegeMapper">
-
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaPrivilege">
- <!--@mbg.generated-->
- <!--@Table ba_privilege-->
- <result column="id" jdbcType="BIGINT" property="id" />
- <result column="num" jdbcType="INTEGER" property="num" />
- <result column="name" jdbcType="VARCHAR" property="name" />
- <result column="type" jdbcType="VARCHAR" property="type" />
- </resultMap>
-
- <sql id="Base_Column_List">
- <!--@mbg.generated-->
- id, num, name, type
- </sql>
-
- <select id="selectAll" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List" />
- from ba_privilege
- </select>
-
- <select id="selectPrivilegeByUserId" resultType="Integer">
- select p.num
- from ba_privilege p
- inner join ba_role_privilege rp on p.id = rp.privilegeId
- inner join ba_user_role ur on rp.roleId = ur.roleId
- inner join ba_role r on ur.roleId = r.id
- where r.deleted != 1
- <if test="userId != null">
- and ur.userId = #{userId, jdbcType=BIGINT}
- </if>
- </select>
-
- <select id="selectPrivilegeByRoleId" resultType="Integer">
- select p.num
- from ba_privilege p
- inner join ba_role_privilege rp on p.id = rp.privilegeId
- <if test="roleId != null">
- where rp.roleId = #{roleId, jdbcType=BIGINT}
- </if>
- </select>
-
- <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaPrivilege">
- <!--@mbg.generated-->
- insert into ba_privilege (<include refid="Base_Column_List" />)
- values (#{id,jdbcType=BIGINT},
- #{num,jdbcType=INTEGER},
- #{name,jdbcType=VARCHAR},
- #{type, jdbcType=VARCHAR}
- )
- </insert>
-
- <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaPrivilege">
- <!--@mbg.generated-->
- insert into ba_privilege
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
- id,
- </if>
- <if test="num != null">
- id,
- </if>
- <if test="name != null">
- name,
- </if>
- <if test="type != null">
- type,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">
- #{id,jdbcType=BIGINT},
- </if>
- <if test="num != null">
- #{name,jdbcType=INTEGER},
- </if>
- <if test="name != null">
- #{name,jdbcType=VARCHAR},
- </if>
- <if test="type != null">
- #{type,jdbcType=VARCHAR},
- </if>
- </trim>
- </insert>
-</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePrivilegeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePrivilegeMapper.xml
deleted file mode 100644
index b90a5e9..0000000
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaRolePrivilegeMapper.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pipIrrGlobal.daoBa.BaRolePrivilegeMapper">
-
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaRolePrivilege">
- <!--@mbg.generated-->
- <!--@Table ba_role_privilege-->
- <id column="roleId" jdbcType="BIGINT" property="roleId" />
- <id column="privilegeId" jdbcType="BIGINT" property="privilegeId" />
- </resultMap>
-
- <sql id="Base_Column_List">
- <!--@mbg.generated-->
- roleId, privilegeId
- </sql>
-
- <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRolePrivilege">
- <!--@mbg.generated-->
- insert into ba_role_privilege (roleId, privilegeId)
- values (#{roleId,jdbcType=BIGINT}, #{privilegeId,jdbcType=BIGINT})
- </insert>
-
- <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaRolePrivilege">
- <!--@mbg.generated-->
- insert into ba_role_privilege
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="roleId != null">
- roleId,
- </if>
- <if test="privilegeId != null">
- privilegeId,
- </if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="roleId != null">
- #{roleId,jdbcType=BIGINT},
- </if>
- <if test="privilegeId != null">
- #{privilegeId,jdbcType=BIGINT},
- </if>
- </trim>
- </insert>
-
- <delete id="deleteByPrimaryKey" parameterType="map">
- <!--@mbg.generated-->
- delete from ba_role_privilege
- where roleId = #{roleId,jdbcType=BIGINT}
- and privilegeId = #{privilegeId,jdbcType=BIGINT}
- </delete>
-
- <delete id="deleteByRoleId" parameterType="long">
- delete from ba_role_privilege
- where roleId = #{roleId,jdbcType=BIGINT}
- </delete>
-
- <delete id="deleteByPrivilegeId" parameterType="long">
- delete from ba_role_privilege
- where privilegeId = #{privilegeId,jdbcType=BIGINT}
- </delete>
-
-</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/config/WebListenerConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/config/WebListenerConfiguration.java
index 2fc5095..fd7f421 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/config/WebListenerConfiguration.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-app/src/main/java/com/dy/pipIrrApp/config/WebListenerConfiguration.java
@@ -54,15 +54,4 @@
return listenerRegistrationBean;
}
-// /**
-// * 鍐呴儴鎻愪緵listener锛岃listener鍦ㄧ郴缁熷惎鍔ㄦ椂锛屽垵濮嬪寲鏁版嵁搴撴暟鎹�
-// * @return 娉ㄥ唽Bean
-// */
-// @Bean
-// public ServletListenerRegistrationBean<? extends ServletContextListener> regInitListener() {
-// ServletListenerRegistrationBean<InitListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
-// listenerRegistrationBean.setListener(new InitListener());
-// listenerRegistrationBean.setOrder(order_init);
-// return listenerRegistrationBean;
-// }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/config/WebListenerConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/config/WebListenerConfiguration.java
index d34e937..25d1a9c 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/config/WebListenerConfiguration.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/config/WebListenerConfiguration.java
@@ -49,15 +49,4 @@
return listenerRegistrationBean;
}
-// /**
-// * 鍐呴儴鎻愪緵listener锛岃listener鍦ㄧ郴缁熷惎鍔ㄦ椂锛屽垵濮嬪寲鏁版嵁搴撴暟鎹�
-// * @return 娉ㄥ唽Bean
-// */
-// @Bean
-// public ServletListenerRegistrationBean<? extends ServletContextListener> regInitListener() {
-// ServletListenerRegistrationBean<InitListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
-// listenerRegistrationBean.setListener(new InitListener());
-// listenerRegistrationBean.setOrder(order_init);
-// return listenerRegistrationBean;
-// }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java
index 2c637aa..f3fd0d7 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/util/InitListener.java
@@ -92,7 +92,7 @@
distriName = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.province.city","name", null, false, null) ;
distriNum = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.province.city","num", null, false, null) ;
distriLevel = configXml.getSetAttrPlusInt(doc, "config.orgs.org" + num + ".districts.province.city","level", null, 1, 99,null) ;
- supperId = this.saveDistrict(null, distriName, distriNum, distriLevel);
+ supperId = this.saveDistrict(supperId, distriName, distriNum, distriLevel);
if(supperId != null && configXml.existElement(doc, "config.orgs.org" + num + ".districts.province.city.country")) {
distriName = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.province.city.country", "name", null, false, null);
distriNum = configXml.getSetAttrTxt(doc, "config.orgs.org" + num + ".districts.province.city.country", "num", null, false, null);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/config/WebListenerConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/config/WebListenerConfiguration.java
index 69b7565..b1aec52 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/config/WebListenerConfiguration.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/config/WebListenerConfiguration.java
@@ -54,15 +54,4 @@
return listenerRegistrationBean;
}
-// /**
-// * 鍐呴儴鎻愪緵listener锛岃listener鍦ㄧ郴缁熷惎鍔ㄦ椂锛屽垵濮嬪寲鏁版嵁搴撴暟鎹�
-// * @return 娉ㄥ唽Bean
-// */
-// @Bean
-// public ServletListenerRegistrationBean<? extends ServletContextListener> regInitListener() {
-// ServletListenerRegistrationBean<InitListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
-// listenerRegistrationBean.setListener(new InitListener());
-// listenerRegistrationBean.setOrder(order_init);
-// return listenerRegistrationBean;
-// }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/config/WebListenerConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/config/WebListenerConfiguration.java
index 19afd6d..a112c8f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/config/WebListenerConfiguration.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/config/WebListenerConfiguration.java
@@ -53,16 +53,4 @@
listenerRegistrationBean.setOrder(order_idSetSuffix);
return listenerRegistrationBean;
}
-
-// /**
-// * 鍐呴儴鎻愪緵listener锛岃listener鍦ㄧ郴缁熷惎鍔ㄦ椂锛屽垵濮嬪寲鏁版嵁搴撴暟鎹�
-// * @return 娉ㄥ唽Bean
-// */
-// @Bean
-// public ServletListenerRegistrationBean<? extends ServletContextListener> regInitListener() {
-// ServletListenerRegistrationBean<InitListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
-// listenerRegistrationBean.setListener(new InitListener());
-// listenerRegistrationBean.setOrder(order_init);
-// return listenerRegistrationBean;
-// }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/config/WebListenerConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/config/WebListenerConfiguration.java
index 3c04122..11430f0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/config/WebListenerConfiguration.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/config/WebListenerConfiguration.java
@@ -54,15 +54,4 @@
return listenerRegistrationBean;
}
-// /**
-// * 鍐呴儴鎻愪緵listener锛岃listener鍦ㄧ郴缁熷惎鍔ㄦ椂锛屽垵濮嬪寲鏁版嵁搴撴暟鎹�
-// * @return 娉ㄥ唽Bean
-// */
-// @Bean
-// public ServletListenerRegistrationBean<? extends ServletContextListener> regInitListener() {
-// ServletListenerRegistrationBean<InitListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
-// listenerRegistrationBean.setListener(new InitListener());
-// listenerRegistrationBean.setOrder(order_init);
-// return listenerRegistrationBean;
-// }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/config/WebListenerConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/config/WebListenerConfiguration.java
index 293ad72..18da8b1 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/config/WebListenerConfiguration.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/config/WebListenerConfiguration.java
@@ -53,16 +53,4 @@
listenerRegistrationBean.setOrder(order_idSetSuffix);
return listenerRegistrationBean;
}
-
-// /**
-// * 鍐呴儴鎻愪緵listener锛岃listener鍦ㄧ郴缁熷惎鍔ㄦ椂锛屽垵濮嬪寲鏁版嵁搴撴暟鎹�
-// * @return 娉ㄥ唽Bean
-// */
-// @Bean
-// public ServletListenerRegistrationBean<? extends ServletContextListener> regInitListener() {
-// ServletListenerRegistrationBean<InitListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
-// listenerRegistrationBean.setListener(new InitListener());
-// listenerRegistrationBean.setOrder(order_init);
-// return listenerRegistrationBean;
-// }
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
index 9ab8e52..e2ab54b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
@@ -245,10 +245,10 @@
if(userPo != null){
vo.dataSourceName = userPo.orgTag ;
vo.logined = true ;
- vo.hasPower = true ;//榛樿鏈夋潈闄�
+ vo.hasPower = true ;//榛樿鏈夋潈闄愩��2023-12-21 缁忓晢璁紝鐢卞墠绔壌鏉�
}else{
vo.logined = false ;
- vo.hasPower = true ;//榛樿鏈夋潈闄�
+ vo.hasPower = true ;//榛樿鏈夋潈闄愩��2023-12-21 缁忓晢璁紝鐢卞墠绔壌鏉�
}
return vo ;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java
index 52c1c6a..9dd39b3 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java
@@ -1,7 +1,6 @@
package com.dy.sso.busi;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dy.pipIrrGlobal.daoBa.BaPrivilegeMapper;
import com.dy.pipIrrGlobal.daoBa.BaUserMapper;
import com.dy.pipIrrGlobal.pojoBa.BaUser;
import lombok.extern.slf4j.Slf4j;
@@ -16,16 +15,10 @@
public class SsoSv {
private BaUserMapper baUserMapper;
- private BaPrivilegeMapper baPrivilegeMapper;
@Autowired
private void setBaUserMapper(BaUserMapper baUserMapper){
this.baUserMapper = baUserMapper ;
- }
-
- @Autowired
- private void setBaPrivilegeMapper(BaPrivilegeMapper baPrivilegeMapper){
- this.baPrivilegeMapper = baPrivilegeMapper ;
}
@@ -40,11 +33,7 @@
@Transactional
@Cacheable(cacheNames=CacheConstants.cacheNames, key="'" + CacheConstants.loginUserKeyPrefix + "' + #uuid", sync=true)
public BaUser loginWithMapperXml(String uuid, String phone, String password){
- BaUser baUser = this.baUserMapper.login(phone, password) ;
- if(baUser != null && baUser.id != null){
- baUser.privileges = this.baPrivilegeMapper.selectPrivilegeByUserId(baUser.id) ;
- }
- return baUser;
+ return this.baUserMapper.login(phone, password) ;
}
/**
@@ -65,11 +54,7 @@
.eq("deleted", 0)
.eq("phone", phone)
.eq("password", password);
- BaUser baUser = this.baUserMapper.selectOne(qw) ;
- if(baUser != null && baUser.id != null){
- baUser.privileges = this.baPrivilegeMapper.selectPrivilegeByUserId(baUser.id) ;
- }
- return baUser;
+ return this.baUserMapper.selectOne(qw) ;
}
@CacheEvict(cacheNames=CacheConstants.cacheNames, key="'" + CacheConstants.loginUserKeyPrefix + "' + #uuid")
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/config/WebListenerConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/config/WebListenerConfiguration.java
index f0bfc9b..4736088 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/config/WebListenerConfiguration.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/config/WebListenerConfiguration.java
@@ -38,7 +38,6 @@
/**
* 鍐呴儴鎻愪緵listener
* @return 娉ㄥ唽Bean
- */
@Bean
public ServletListenerRegistrationBean<? extends ServletContextListener> reqSsoListener() {
ServletListenerRegistrationBean<SsoListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
@@ -47,4 +46,5 @@
listenerRegistrationBean.setOrder(order_sso);
return listenerRegistrationBean;
}
+ */
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/config/WebListenerConfiguration.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/config/WebListenerConfiguration.java
index 2819225..d9b52a4 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/config/WebListenerConfiguration.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/config/WebListenerConfiguration.java
@@ -20,7 +20,6 @@
*/
//private static final int order_config = 0 ;
private static final int order_idSetSuffix = 1 ;
- //private static final int order_init = 2 ;
/*
* 瑙ｆ瀽鍚勭***.config閰嶇疆鐨凜onfigListener锛屾殏鏃朵笉閲囩敤姝ょ閰嶇疆鏂瑰紡
@@ -54,15 +53,4 @@
return listenerRegistrationBean;
}
-// /**
-// * 鍐呴儴鎻愪緵listener锛岃listener鍦ㄧ郴缁熷惎鍔ㄦ椂锛屽垵濮嬪寲鏁版嵁搴撴暟鎹�
-// * @return 娉ㄥ唽Bean
-// */
-// @Bean
-// public ServletListenerRegistrationBean<? extends ServletContextListener> regInitListener() {
-// ServletListenerRegistrationBean<InitListener> listenerRegistrationBean = new ServletListenerRegistrationBean<>();
-// listenerRegistrationBean.setListener(new InitListener());
-// listenerRegistrationBean.setOrder(order_init);
-// return listenerRegistrationBean;
-// }
}
--
Gitblit v1.8.0