Merge branch 'dev' of http://114.244.114.158:8802/siwei/sanya-data-management-back into dev

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/jsc/JscMapper.java

@@ -1,6 +1,6 @@
 package com.onemap.apply.mapper.jsc;
 
-import com.onemap.apply.mapper.jsc.provider.JscrSqlProvider;
+import com.onemap.apply.mapper.jsc.provider.JscSqlProvider;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.SelectProvider;
 
@@ -14,7 +14,7 @@ import java.util.Map;
 @Mapper
 public interface JscMapper {
 
-    @SelectProvider(value = JscrSqlProvider.class, method = "getSqlListByMap")
+    @SelectProvider(value = JscSqlProvider.class, method = "getSqlListByMap")
     public List<Map<String, Object>> getBeanListByEntity(Map<String, Object> map);
 
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/jsc/provider/JscrSqlProvider.java → onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/jsc/provider/JscSqlProvider.java

@@ -9,7 +9,7 @@ import java.util.Set;
  * @author lvhp
  * * @date 2024/5/21
  */
-public class JscrSqlProvider {
+public class JscSqlProvider {
 
     public String getSqlListByMap(Map<String, Object> map) {
         StringBuilder sqlBuilder = new StringBuilder("");
@@ -27,9 +27,9 @@ public class JscrSqlProvider {
                                 sqlBuilder.append(" and ");
                             }
                             if ("begin_time".equals(key)) {
-                                sqlBuilder.append(" a.").append(key.trim()).append(">= #{").append(key.trim()).append("} ");
+                                sqlBuilder.append(" a.").append("create_time").append(" >= #{").append(key.trim()).append("} ");
                             } else if ("end_time".equals(key)) {
-                                sqlBuilder.append(" a.").append(key.trim()).append("< #{").append(key.trim()).append("} ");
+                                sqlBuilder.append(" a.").append("create_time").append(" < #{").append(key.trim()).append("} ");
                             } else {
                                 sqlBuilder.append(" a.").append(key.trim()).append("= #{").append(key.trim()).append("} ");
                             }

onemap-modules/onemap-system/src/main/java/com/onemap/system/mapper/TJscSqlMapper.java

@@ -58,4 +58,11 @@ public interface TJscSqlMapper {
      * @return 结果
      */
     public int deleteTJscSqlByIds(String[] ids);
+
+
+    /**
+     * 执行视图
+     * @param view 视图
+     */
+    public void handleView(String view);
 }

onemap-modules/onemap-system/src/main/java/com/onemap/system/service/impl/TJscSqlServiceImpl.java

@@ -3,12 +3,14 @@ package com.onemap.system.service.impl;
 import java.util.List;
 
 import com.onemap.common.core.utils.DateUtils;
+import com.onemap.common.core.utils.StringUtils;
 import com.onemap.common.core.utils.uuid.UUID;
 import com.onemap.system.domain.TJscSql;
 import com.onemap.system.mapper.TJscSqlMapper;
 import com.onemap.system.service.ITJscSqlService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 驾驶舱数据处理Service业务层处理
@@ -50,10 +52,15 @@ public class TJscSqlServiceImpl implements ITJscSqlService {
      * @return 结果
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int insertTJscSql(TJscSql tJscSql) {
         tJscSql.setId(UUID.randomUUID().toString());
         tJscSql.setCreateTime(DateUtils.getNowDate());
-        return tJscSqlMapper.insertTJscSql(tJscSql);
+        int i = tJscSqlMapper.insertTJscSql(tJscSql);
+        if (i > 0 && StringUtils.isNotEmpty(tJscSql.getJscView())) {
+            handleView(tJscSql.getJscView());
+        }
+        return i;
     }
 
     /**
@@ -63,9 +70,14 @@ public class TJscSqlServiceImpl implements ITJscSqlService {
      * @return 结果
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int updateTJscSql(TJscSql tJscSql) {
         tJscSql.setUpdateTime(DateUtils.getNowDate());
-        return tJscSqlMapper.updateTJscSql(tJscSql);
+        int i = tJscSqlMapper.updateTJscSql(tJscSql);
+        if (i > 0 && StringUtils.isNotEmpty(tJscSql.getJscView())) {
+            handleView(tJscSql.getJscView());
+        }
+        return i;
     }
 
     /**
@@ -75,6 +87,7 @@ public class TJscSqlServiceImpl implements ITJscSqlService {
      * @return 结果
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int deleteTJscSqlByIds(String[] ids) {
         return tJscSqlMapper.deleteTJscSqlByIds(ids);
     }
@@ -86,7 +99,14 @@ public class TJscSqlServiceImpl implements ITJscSqlService {
      * @return 结果
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int deleteTJscSqlById(String id) {
         return tJscSqlMapper.deleteTJscSqlById(id);
     }
+
+
+    private void handleView(String view) {
+        tJscSqlMapper.handleView(view);
+    }
+
 }

onemap-modules/onemap-system/src/main/resources/mapper/postgresql/system/TJscSqlMapper.xml

@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTJscSqlList" parameterType="TJscSql" resultMap="TJscSqlResult">
         <include refid="selectTJscSqlVo"/>
         <where>  
-            <if test="jscType != null  and jscType != ''"> and jsc_type like '%'|| #{jscType} || '%' </if>
+            <if test="jscType != null  and jscType != ''"> and jsc_type &gt; #{jscType}  </if>
             <if test="jscView != null  and jscView != ''"> and jsc_view = #{jscView}</if>
             <if test="jscSql != null  and jscSql != ''"> and jsc_sql = #{jscSql}</if>
         </where>
@@ -90,4 +90,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
+    <update id="handleView" parameterType="String">
+        ${view}
+    </update>
+
 </mapper>

sql/pgsql/0_init.sql

@@ -25,3 +25,22 @@ values(3004,'数据删除', 3000, '4',  '#', '', 1, 0, 'F', '0', '0', 'system:js
 
 insert into base.sys_menu (menu_id,menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
 values(3005,'数据导出', 3000, '5',  '#', '', 1, 0, 'F', '0', '0', 'system:jsc:data:export',       '#', 'admin', now(), '', null, '');
+
+-- 土地卫片执法遥感监测分类表
+-- delete from base.business_dic where "type"='土地卫片执法遥感监测分类表';
+INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增线性地物','11', '土地卫片执法遥感监测分类表', '新增线性地物', '1');
+INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增公路','111', '土地卫片执法遥感监测分类表', '新增公路', '1');
+INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增铁路','112', '土地卫片执法遥感监测分类表', '新增铁路', '1');
+INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增建（构）筑物','12', '土地卫片执法遥感监测分类表', '新增建（构）筑物', '1');
+INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增建筑物','121', '土地卫片执法遥感监测分类表', '新增建筑物', '1');
+INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增构筑物','122', '土地卫片执法遥感监测分类表', '新增构筑物', '1');
+INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增高尔夫运动用地','13', '土地卫片执法遥感监测分类表', '新增高尔夫运动用地', '1');
+INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增推堆土','21', '土地卫片执法遥感监测分类表', '新增推堆土', '1');
+INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增其他道路','22', '土地卫片执法遥感监测分类表', '新增其他道路', '1');
+INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增点状地物','23', '土地卫片执法遥感监测分类表', '新增点状地物', '1');
+INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增其他线形地物','31', '土地卫片执法遥感监测分类表', '新增其他线形地物', '1');
+INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增库塘','32', '土地卫片执法遥感监测分类表', '新增库塘', '1');
+INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增林业园地','33', '土地卫片执法遥感监测分类表', '新增林业园地', '1');
+INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('建筑物翻建、续建','34', '土地卫片执法遥感监测分类表', '建筑物翻建、续建', '1');
+INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('新增光伏方阵用地','35', '土地卫片执法遥感监测分类表', '新增光伏方阵用地', '1');
+INSERT INTO base.business_dic ("name", value, "type", title, status) VALUES('年度内续建','41', '土地卫片执法遥感监测分类表', '年度内续建', '1');