Merge branch 'main' into 'dev'

Main

See merge request !5

.gitlab-ci.yml

@@ -31,6 +31,8 @@ package:
     paths:
       - ./ruoyi-admin/target/ruoyi-admin.jar
   image: hub.eazytec-cloud.com/devops/maven:3.3.9-jdk-8
+  only:
+    - master
 
 
 deploy:
@@ -47,6 +49,8 @@ deploy:
     - if [ $TAG == "master" ]; then TAG="latest"; fi
     - docker build --pull -t ${REPO}/${NAMESPACE}/${IMAGE}:${TAG} .
     - docker push ${REPO}/${NAMESPACE}/${IMAGE}:${TAG}
+  only:
+    - main
 
 publish:
   image: hub.eazytec-cloud.com/devops/oc:3.11
@@ -57,3 +61,5 @@ publish:
   script:
     - if [ $TAG == "master" ]; then TAG="latest"; fi
     - oc import-image ${IMAGESTREAM}:${TAG} --from=${REPO}/${NAMESPACE}/${IMAGE}:${TAG} --confirm
+  only:
+    - main
\ No newline at end of file

ruoyi-admin/src/main/java/com/ruoyi/web/controller/grid/RegionController.java

@@ -703,4 +703,37 @@ public class RegionController extends BaseController {
         });
         return AjaxResult.success(result);
     }
+
+    @RequestMapping(value = "/getThirdRegion",method = RequestMethod.GET)
+    @ResponseBody
+    public AjaxResult getThirdRegion(@RequestParam(value = "wgType", required = false) String wgType,
+                                     @RequestParam(value = "wgCode", required = false) String wgCode,
+                                     @RequestParam(value = "pageNum", required = false) Integer pageNum,
+                                     @RequestParam(value = "pageSize", required = false) Integer pageSize,
+                                     @RequestParam(value = "name", required = false) String name
+                                     ){
+        List<String> wgCodeLikes = new ArrayList<>();
+        if(!StringUtils.isBlank(wgCode)){
+            wgCodeLikes = Arrays.asList(wgCode.split(","));
+        }
+
+        List<GridRegion> gridRegionList = gridRegionMapper.getThirdRegion(wgType,wgCodeLikes,name);
+        return AjaxResult.success(gridRegionList);
+    }
+
+    @RequestMapping(value = "/getOneOrTwoRegion",method = RequestMethod.GET)
+    @ResponseBody
+    public AjaxResult getOneOrTwoRegion(@RequestParam(value = "level", required = false) String level,
+                                     @RequestParam(value = "pageNum", required = false) Integer pageNum,
+                                     @RequestParam(value = "pageSize", required = false) Integer pageSize
+    ){
+        GridRegionExample example = new GridRegionExample();
+        GridRegionExample.Criteria criteria = example.createCriteria();
+        criteria.andIsValidEqualTo("1");
+        criteria.andLevelEqualTo(level);
+        criteria.andWgTypeEqualTo("1");
+
+        List<GridRegion> gridRegionList = gridRegionMapper.selectByExample(example);
+        return AjaxResult.success(gridRegionList);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/HouseResourceAssociationObjectController.java

+package com.ruoyi.web.controller.house;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.house.HouseResourceAssociationObject;
+import com.ruoyi.system.service.house.HouseResourceAssociationObjectService;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/houseAssociationObject")
+public class HouseResourceAssociationObjectController {
+
+    private final HouseResourceAssociationObjectService houseResourceAssociationObjectService;
+
+    public HouseResourceAssociationObjectController(HouseResourceAssociationObjectService houseResourceAssociationObjectService) {
+        this.houseResourceAssociationObjectService = houseResourceAssociationObjectService;
+    }
+
+    @PostMapping
+    public AjaxResult insertHouseResourceAssociationObject(@RequestBody HouseResourceAssociationObject houseResourceAssociationObject) {
+        houseResourceAssociationObjectService.saveHouseResourceAssociationObject(houseResourceAssociationObject);
+        return AjaxResult.success();
+    }
+
+    @PutMapping
+    public AjaxResult updateHouseResourceAssociationObject(@RequestBody HouseResourceAssociationObject houseResourceAssociationObject) {
+        houseResourceAssociationObjectService.updateHouseResourceAssociationObject(houseResourceAssociationObject);
+        return AjaxResult.success();
+    }
+
+    @GetMapping
+    public AjaxResult getHouseResourceAssociationObjectByHouseResourceIdType(@RequestParam String houseResourceId, @RequestParam int type) {
+        return AjaxResult.success(houseResourceAssociationObjectService.queryHouseResourceAssociationObjectByHouseResourceIdType(houseResourceId, type));
+    }
+
+    @DeleteMapping
+    public AjaxResult deleteHouseResourceAssociationObjectById(@RequestParam String id) {
+        houseResourceAssociationObjectService.deleteHouseResourceAssociationObjectById(id);
+        return AjaxResult.success();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/HouseResourceAssociationObject.java

+package com.ruoyi.system.domain.house;
+
+import lombok.Data;
+
+@Data
+public class HouseResourceAssociationObject {
+
+    private String id;
+
+    private int type;
+
+    private String houseResourceId;
+
+    private String businessId;
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/grid/GridRegionMapper.java

@@ -45,4 +45,6 @@ public interface GridRegionMapper {
     List<GridRegion> getByParams(GridRegionSearchParam param);
 
     Integer countByParams(GridRegionSearchParam param);
+
+    List<GridRegion> getThirdRegion(@Param("wgType")String wgType,@Param("wgCodeLikes")List<String> wgCodeLikes,@Param("name")String name);
 }
\ No newline at end of file

ruoyi-system/src/main/java/com/ruoyi/system/mapper/house/HouseResourceAssociationObjectMapper.java

+package com.ruoyi.system.mapper.house;
+
+import com.ruoyi.system.domain.house.HouseResourceAssociationObject;
+import org.apache.ibatis.annotations.Param;
+
+public interface HouseResourceAssociationObjectMapper {
+
+    void insertHouseResourceObjectAssociation(HouseResourceAssociationObject houseResourceAssociationObject);
+
+    HouseResourceAssociationObject selectHouseResourceObjectAssociationById(String id);
+
+    void updateHouseResourceObjectAssociation(HouseResourceAssociationObject houseResourceAssociationObject);
+
+    void deleteHouseResourceObjectAssociationById(String id);
+
+    HouseResourceAssociationObject selectHouseResourceObjectAssociationByHouseResourceIdType(@Param("houseResourceId") String houseResourceId, @Param("type") int type);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/house/HouseResourceAssociationObjectService.java

+package com.ruoyi.system.service.house;
+
+import com.ruoyi.system.domain.house.HouseResourceAssociationObject;
+
+public interface HouseResourceAssociationObjectService {
+
+    void saveHouseResourceAssociationObject(HouseResourceAssociationObject houseResourceAssociationObject);
+
+    void updateHouseResourceAssociationObject(HouseResourceAssociationObject houseResourceAssociationObject);
+
+    void deleteHouseResourceAssociationObjectById(String id);
+
+    HouseResourceAssociationObject queryHouseResourceAssociationObjectById(String id);
+
+    HouseResourceAssociationObject queryHouseResourceAssociationObjectByHouseResourceIdType(String houseResourceId, int type);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/house/impl/HouseResourceAssociationObjectServiceImpl.java

+package com.ruoyi.system.service.house.impl;
+
+import com.ruoyi.system.domain.house.HouseResourceAssociationObject;
+import com.ruoyi.system.mapper.house.HouseResourceAssociationObjectMapper;
+import com.ruoyi.system.service.house.HouseResourceAssociationObjectService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+public class HouseResourceAssociationObjectServiceImpl implements HouseResourceAssociationObjectService {
+
+    private final HouseResourceAssociationObjectMapper houseResourceAssociationObjectMapper;
+
+    public HouseResourceAssociationObjectServiceImpl(HouseResourceAssociationObjectMapper houseResourceAssociationObjectMapper) {
+        this.houseResourceAssociationObjectMapper = houseResourceAssociationObjectMapper;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveHouseResourceAssociationObject(HouseResourceAssociationObject houseResourceAssociationObject) {
+        houseResourceAssociationObjectMapper.insertHouseResourceObjectAssociation(houseResourceAssociationObject);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateHouseResourceAssociationObject(HouseResourceAssociationObject houseResourceAssociationObject) {
+        houseResourceAssociationObjectMapper.updateHouseResourceObjectAssociation(houseResourceAssociationObject);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteHouseResourceAssociationObjectById(String id) {
+        houseResourceAssociationObjectMapper.deleteHouseResourceObjectAssociationById(id);
+    }
+
+    @Override
+    public HouseResourceAssociationObject queryHouseResourceAssociationObjectById(String id) {
+        return houseResourceAssociationObjectMapper.selectHouseResourceObjectAssociationById(id);
+    }
+
+    @Override
+    public HouseResourceAssociationObject queryHouseResourceAssociationObjectByHouseResourceIdType(String houseResourceId, int type) {
+        return houseResourceAssociationObjectMapper.selectHouseResourceObjectAssociationByHouseResourceIdType(houseResourceId, type);
+    }
+}

ruoyi-system/src/main/resources/mapper/grid/GridRegionMapper.xml

@@ -612,4 +612,28 @@
       and level = #{level}
     </if>
   </select>
+    <select id="getThirdRegion" resultType="com.ruoyi.system.domain.grid.GridRegion">
+      select
+      <include refid="Base_Column_List" />
+      from grid_region where is_valid = '1'
+      <if test="wgCodeLikes != null and wgCodeLikes.size() > 0">
+        and (
+        <foreach collection="wgCodeLikes" item="wgCode" open="(" close=")" separator="or">
+          wg_code like CONCAT(#{wgCode}, '%')
+        </foreach>
+        )
+        and (
+        <foreach collection="wgCodeLikes" item="wgCode" open="(" close=")" separator="and">
+          wg_code != #{wgCode}
+        </foreach>
+        )
+      </if>
+      <if test="wgType != null and wgType != ''">
+        and wg_type = #{wgType}
+      </if>
+      <if test="name != null and name != ''">
+        and wg_name = #{name}
+      </if>
+      and level = 3
+    </select>
 </mapper>
\ No newline at end of file

ruoyi-system/src/main/resources/mapper/house/HouseResourceAssociationObjectMapper.xml

+<?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.ruoyi.system.mapper.house.HouseResourceAssociationObjectMapper">
+    <resultMap id="BaseResultMap" type="com.ruoyi.system.domain.house.HouseResourceAssociationObject">
+        <id property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="type" column="type" jdbcType="INTEGER"/>
+        <result property="houseResourceId" column="house_resource_id" jdbcType="VARCHAR"/>
+        <result property="businessId" column="business_id" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <insert id="insertHouseResourceObjectAssociation" parameterType="com.ruoyi.system.domain.house.HouseResourceAssociationObject">
+        INSERT INTO house_resource_association_object
+            (id, type, house_resource_id, business_id)
+        VALUES
+            (#{id,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER},
+             #{houseResourceId,jdbcType=VARCHAR}, #{businessId,jdbcType=VARCHAR})
+    </insert>
+
+    <select id="selectHouseResourceObjectAssociationById" parameterType="String" resultType="com.ruoyi.system.domain.house.HouseResourceAssociationObject">
+        SELECT id, type, house_resource_id, business_id
+        FROM house_resource_association_object
+        WHERE id = #{id}
+    </select>
+
+    <update id="updateHouseResourceObjectAssociation" parameterType="com.ruoyi.system.domain.house.HouseResourceAssociationObject">
+        UPDATE house_resource_association_object
+        SET type = #{type,jdbcType=INTEGER},
+            house_resource_id = #{houseResourceId,jdbcType=VARCHAR},
+            business_id = #{businessId,jdbcType=VARCHAR}
+        WHERE id = #{id,jdbcType=VARCHAR}
+    </update>
+
+    <delete id="deleteHouseResourceObjectAssociationById" parameterType="String">
+        DELETE FROM house_resource_association_object
+        WHERE id = #{id}
+    </delete>
+
+    <select id="selectHouseResourceObjectAssociationByHouseResourceIdType"
+            resultType="com.ruoyi.system.domain.house.HouseResourceAssociationObject">
+        SELECT id, type, house_resource_id, business_id
+        FROM house_resource_association_object where house_resource_id = #{houseResourceId} and type = #{type}
+    </select>
+</mapper>
\ No newline at end of file