2024-07-12 朱宝民 片区查询功能过滤掉已删除数据

Administrator

2024-07-12 c76d827e20edb8c473bec4e4b1ee57cb283f7e19

2024-07-12 朱宝民 片区查询功能过滤掉已删除数据

 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/command/ComSupport.java

@@ -19,7 +19,6 @@
import com.dy.pipIrrGlobal.pojoSe.SeVirtualCard;
import jakarta.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@ -46,7 +45,7 @@
 */

public class ComSupport {
    @Value("${mw.comSendUrl}")
    //@Value("${mw.comSendUrl}")
    private String comSendUrl;

    protected static String controllerType = null;

 pipIrr-platform/pipIrr-global/src/main/resources/application-database-ym.yml

@@ -5,8 +5,8 @@
            #name: ym
            type: com.alibaba.druid.pool.DruidDataSource
            driverClassName: com.mysql.cj.jdbc.Driver
#            url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
            url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
            url: jdbc:mysql://192.168.40.166:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#            url: jdbc:mysql://127.0.0.1:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
#            url: jdbc:mysql://8.140.179.55:3306/pipIrr_ym?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
            username: root
            password: dysql,;.abc!@#

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml

@@ -26,7 +26,7 @@
    select
    <include refid="Base_Column_List" />
    from ba_block
    where id = #{id,jdbcType=BIGINT}
    where id = #{id,jdbcType=BIGINT} and deleted = 0
  </select>

  <select id="selectAll" resultMap="BaseResultMap">
@@ -34,6 +34,7 @@
<!--    <include refid="part_Column_List" />-->
    <include refid="Base_Column_List" />
    from ba_block
    WHERE deleted = 0
  </select>

<select id="selectTotal" parameterType="java.util.Map" resultType="java.lang.Long">
@@ -61,6 +62,7 @@
    <include refid="Base_Column_List" />
    from ba_block
    <trim prefix="where " suffixOverrides="and">
      deleted = 0 and
      <if test="name != null and name != ''">
        name like concat('%', #{name}, '%') and
      </if>

 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java

@@ -26,7 +26,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.env.Environment;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
@@ -54,8 +53,8 @@
    private final SeVirtualCardMapper seVirtualCardMapper;
    private final IDLongGenerator idLongGenerator;

    @Value("${mw.rtuCallbackUrl_wx}")
    private String rtuCallbackUrl_wx;
    //@Value("${mw.rtuCallbackUrl_wx}")
    private String rtuCallbackUrl_wx = null;

    private Environment env = null;

@@ -82,7 +81,7 @@

        String pro_mw = "mw";
        String key_mw = "comSendUrl";
        String a = env.getProperty(pro_mw + "." + key_mw);
        rtuCallbackUrl_wx = env.getProperty(pro_mw + "." + key_mw);

        Long intakeId = valve.getIntakeId();
        String intakeName = valve.getIntakeName();