jczz_manager.git

parent: dec7b42d | patch | commit | ignore whitespace

Merge remote-tracking branch 'origin/master'

lin

2024-04-10 d3c223eaa4df46d17c138ef8ed5eab8da9638416

Merge remote-tracking branch 'origin/master'

10 files modified

	src/main/java/org/springblade/es/controller/EsController.java	41 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/org/springblade/es/service/ElasticsearchDocumentService.java	42 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/org/springblade/modules/circle/entity/CircleEntity.java	4 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/org/springblade/modules/task/controller/ECallEventController.java	10 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.java	5 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml	8 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/org/springblade/modules/task/service/IECallEventService.java	7 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/org/springblade/modules/task/service/impl/ECallEventServiceImpl.java	30 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/application-prod.yml	4 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/application-test.yml	2 ●●●●● patch \| view \| raw \| blame \| history

 src/main/java/org/springblade/es/controller/EsController.java

@@ -5,7 +5,9 @@
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.annotation.PreAuth;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.Func;
import org.springblade.es.service.ElasticsearchDocumentService;
import org.springblade.es.vo.EsParam;
@@ -35,35 +37,37 @@
     * 初始化
     */
    @GetMapping("/init")
    @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
    @ApiOperationSupport(order = 2)
    public R init(EsParam esParam) {
        return R.status(elasticsearchDocumentService.init(esParam));
    }

    /**
     * 新增数据
     */
    @GetMapping("/add")
    @ApiOperationSupport(order = 3)
    public R add(EsParam esParam) {
        return R.status(elasticsearchDocumentService.add(esParam,null));
    }

    /**
     * 修改数据
     */
    @GetMapping("/update")
    @ApiOperationSupport(order = 4)
    public R update(EsParam esParam) {
        elasticsearchDocumentService.update(esParam,null,null);
        return R.status(true);
    }
//    /**
//     * 新增数据
//     */
//    @GetMapping("/add")
//    @ApiOperationSupport(order = 3)
//    public R add(EsParam esParam) {
//        return R.status(elasticsearchDocumentService.add(esParam,null));
//    }
//
//    /**
//     * 修改数据
//     */
//    @GetMapping("/update")
//    @ApiOperationSupport(order = 4)
//    public R update(EsParam esParam) {
//        elasticsearchDocumentService.update(esParam,null,null);
//        return R.status(true);
//    }

    /**
     * 根据索引删除
     */
    @PostMapping("/removeBatchByIndexNames")
    @ApiOperationSupport(order = 5)
    @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
    public R removeBatchByIndexNames(@RequestParam String indexNames) {
        return R.status(elasticsearchDocumentService.removeBatchByIndexNames(Func.toStrList(indexNames)));
    }
@@ -72,6 +76,7 @@
     * 根据条件删除
     */
    @PostMapping("/removeByQuery")
    @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
    @ApiOperationSupport(order = 6)
    public R removeByQuery(EsParam esParam) {
        return R.status(elasticsearchDocumentService.removeByQuery(esParam));

 src/main/java/org/springblade/es/service/ElasticsearchDocumentService.java

@@ -539,16 +539,19 @@
     */
    public boolean removeBatchByIndexNames(List<String> indexNames) {
        for (String indexName : indexNames) {
            DeleteIndexRequest deleteIndexRequest = new DeleteIndexRequest(indexName);
            try {
                // 执行删除索引操作
                AcknowledgedResponse deleteResponse = client.indices().delete(deleteIndexRequest, RequestOptions.DEFAULT);
            // 索引存在才删除
            if (isIndexExists(indexName)) {
                DeleteIndexRequest deleteIndexRequest = new DeleteIndexRequest(indexName);
                try {
                    // 执行删除索引操作
                    AcknowledgedResponse deleteResponse = client.indices().delete(deleteIndexRequest, RequestOptions.DEFAULT);

                // 输出操作结果
                boolean acknowledged = deleteResponse.isAcknowledged();
                System.out.println("索引删除成功: " + acknowledged);
            } catch (IOException e) {
                e.printStackTrace();
                    // 输出操作结果
                    boolean acknowledged = deleteResponse.isAcknowledged();
                    System.out.println("索引删除成功: " + acknowledged);
                } catch (IOException e) {
                    e.printStackTrace();
                }
            }
        }
        return true;
@@ -576,7 +579,8 @@
     */
    @Async
    public void update(EsParam esParam, T item,List<String> columnList) {
        if (elasticsearchSync) {
        // 判断索引是否存在
        if (elasticsearchSync && isIndexExists(esParam.getIndexName())) {
            // 创建更新请求
            UpdateByQueryRequest updateRequest = new UpdateByQueryRequest(esParam.getIndexName());

@@ -589,17 +593,17 @@

            Map<String, Object> data = new HashMap<String, Object>();
            data.put("tableName", esParam.getTableName());
            if (esParam.getTableName().equals("jczz_article")){
                setArticleMap((Article)item,data);
            if (esParam.getTableName().equals("jczz_article")) {
                setArticleMap((Article) item, data);
            }
            if (esParam.getTableName().equals("jczz_place")){
                setPlaceMap((PlaceEntity) item,data);
            if (esParam.getTableName().equals("jczz_place")) {
                setPlaceMap((PlaceEntity) item, data);
            }
            if (esParam.getTableName().equals("jczz_house")){
                setHouseMap((HouseEntity) item,data);
            if (esParam.getTableName().equals("jczz_house")) {
                setHouseMap((HouseEntity) item, data);
            }
            if (esParam.getTableName().equals("jczz_household")){
                setHousehouldMap((HouseholdEntity) item,data);
            if (esParam.getTableName().equals("jczz_household")) {
                setHousehouldMap((HouseholdEntity) item, data);
            }
            Map<String, Object> param = new HashMap<String, Object>();
            param.put("data", data);
@@ -675,7 +679,7 @@
     * 删除数据--根据条件
     */
    public boolean removeByQuery(EsParam esParam) {
        if (elasticsearchSync) {
        if (elasticsearchSync && isIndexExists(esParam.getIndexName())) {
            DeleteByQueryRequest deleteByQueryRequest = new DeleteByQueryRequest(esParam.getIndexName());
            // 根据多个条件 生成 boolQueryBuilder
            BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();

 src/main/java/org/springblade/modules/circle/entity/CircleEntity.java

@@ -85,8 +85,8 @@
    @TableField("event_id")
    private Long eventId;

    /** 事件类型：1：报事报修 */
    @ApiModelProperty(value = "事件类型：1：报事报修", example = "")
    /** 事件类型：1：报事报修 2:E呼即办*/
    @ApiModelProperty(value = "事件类型：1：报事报修 2:E呼即办", example = "")
    @TableField("even_type")
    private Integer evenType;


 src/main/java/org/springblade/modules/task/controller/ECallEventController.java

@@ -127,5 +127,15 @@
        return R.data(eCallEventService.dataHandle());
    }

    /**
     * e呼即办数据批量分享到圈子
     * @param type
     * @return
     */
    @GetMapping("/batchShareCircle")
    public R batchShareCircle(Integer type) {
        return R.status(eCallEventService.batchShareCircle(type));
    }


}

 src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.java

@@ -46,4 +46,9 @@
                                            @Param("isAdministrator") Integer isAdministrator);


    /**
     * 查询未分享到圈子的内容
     * @return
     */
    List<ECallEventEntity> getNotShareCircleList();
}

 src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml

@@ -61,5 +61,13 @@
        order by jece.create_time desc,jece.id desc
    </select>

    <!--查询未分享到圈子的内容-->
    <select id="getNotShareCircleList" resultType="org.springblade.modules.task.entity.ECallEventEntity">
        select
        jece.*
        from jczz_e_call_event jece
        left join jczz_circle jc on jc.event_id = jece.id and jc.even_type = 2 and jc.deleted_falg =0
        where jece.is_deleted = 0 and jc.id is null
    </select>

</mapper>

 src/main/java/org/springblade/modules/task/service/IECallEventService.java

@@ -44,4 +44,11 @@
     * e呼即办数据处理
     */
    Object dataHandle();

    /**
     * e呼即办数据批量分享到圈子
     * @param type
     * @return
     */
    boolean batchShareCircle(Integer type);
}

 src/main/java/org/springblade/modules/task/service/impl/ECallEventServiceImpl.java

@@ -20,7 +20,10 @@
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.SysCache;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.circle.entity.CircleEntity;
import org.springblade.modules.circle.service.ICircleService;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.task.entity.ECallEventEntity;
@@ -69,4 +72,31 @@
        }
        return null;
    }

    /**
     * e呼即办数据批量分享到圈子
     * @param type 0 :邻里 1协同
     * @return
     */
    @Override
    public boolean batchShareCircle(Integer type) {
        boolean flag = true;
        ICircleService circleService = SpringUtils.getBean(ICircleService.class);
        // 查询未分享到圈子的内容
        List<ECallEventEntity> list = baseMapper.getNotShareCircleList();
        // 遍历插入到圈子表
        for (ECallEventEntity callEventEntity : list) {
            CircleEntity circleEntity = new CircleEntity();
            circleEntity.setEventId(callEventEntity.getId());
            circleEntity.setEvenType(2);
            circleEntity.setCommunityCode(callEventEntity.getCommunityCode());
            circleEntity.setCircleType(type);
            circleEntity.setCircleText(callEventEntity.getRemark());
            circleEntity.setHouseCode(callEventEntity.getAddressCode());
            circleEntity.setCircleImages(callEventEntity.getImageUrls());
            // 保存
            circleService.saveCircle(circleEntity);
        }
        return flag;
    }
}

 src/main/resources/application-prod.yml

@@ -75,6 +75,6 @@
#es
elasticsearch:
  enabled: false
  host: localhost
  sync: false
  host: 127.0.0.1
  sync: true
  indexName: jczz

 src/main/resources/application-test.yml

@@ -75,6 +75,6 @@
#es
elasticsearch:
  enabled: false
  host: localhost
  host: 127.0.0.1
  sync: true
  indexName: test

			@@ -5,7 +5,9 @@
			import lombok.AllArgsConstructor;
			import org.springblade.core.mp.support.Condition;
			import org.springblade.core.mp.support.Query;
			import org.springblade.core.secure.annotation.PreAuth;
			import org.springblade.core.tool.api.R;
			import org.springblade.core.tool.constant.RoleConstant;
			import org.springblade.core.tool.utils.Func;
			import org.springblade.es.service.ElasticsearchDocumentService;
			import org.springblade.es.vo.EsParam;
			@@ -35,35 +37,37 @@
			* 初始化
			*/
			@GetMapping("/init")
			@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
			@ApiOperationSupport(order = 2)
			public R init(EsParam esParam) {
			return R.status(elasticsearchDocumentService.init(esParam));
			}

			/**
			* 新增数据
			*/
			@GetMapping("/add")
			@ApiOperationSupport(order = 3)
			public R add(EsParam esParam) {
			return R.status(elasticsearchDocumentService.add(esParam,null));
			}

			/**
			* 修改数据
			*/
			@GetMapping("/update")
			@ApiOperationSupport(order = 4)
			public R update(EsParam esParam) {
			elasticsearchDocumentService.update(esParam,null,null);
			return R.status(true);
			}
			// /**
			// * 新增数据
			// */
			// @GetMapping("/add")
			// @ApiOperationSupport(order = 3)
			// public R add(EsParam esParam) {
			// return R.status(elasticsearchDocumentService.add(esParam,null));
			// }
			//
			// /**
			// * 修改数据
			// */
			// @GetMapping("/update")
			// @ApiOperationSupport(order = 4)
			// public R update(EsParam esParam) {
			// elasticsearchDocumentService.update(esParam,null,null);
			// return R.status(true);
			// }

			/**
			* 根据索引删除
			*/
			@PostMapping("/removeBatchByIndexNames")
			@ApiOperationSupport(order = 5)
			@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
			public R removeBatchByIndexNames(@RequestParam String indexNames) {
			return R.status(elasticsearchDocumentService.removeBatchByIndexNames(Func.toStrList(indexNames)));
			}
			@@ -72,6 +76,7 @@
			* 根据条件删除
			*/
			@PostMapping("/removeByQuery")
			@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
			@ApiOperationSupport(order = 6)
			public R removeByQuery(EsParam esParam) {
			return R.status(elasticsearchDocumentService.removeByQuery(esParam));

			@@ -539,16 +539,19 @@
			*/
			public boolean removeBatchByIndexNames(List<String> indexNames) {
			for (String indexName : indexNames) {
			DeleteIndexRequest deleteIndexRequest = new DeleteIndexRequest(indexName);
			try {
			// 执行删除索引操作
			AcknowledgedResponse deleteResponse = client.indices().delete(deleteIndexRequest, RequestOptions.DEFAULT);
			// 索引存在才删除
			if (isIndexExists(indexName)) {
			DeleteIndexRequest deleteIndexRequest = new DeleteIndexRequest(indexName);
			try {
			// 执行删除索引操作
			AcknowledgedResponse deleteResponse = client.indices().delete(deleteIndexRequest, RequestOptions.DEFAULT);

			// 输出操作结果
			boolean acknowledged = deleteResponse.isAcknowledged();
			System.out.println("索引删除成功: " + acknowledged);
			} catch (IOException e) {
			e.printStackTrace();
			// 输出操作结果
			boolean acknowledged = deleteResponse.isAcknowledged();
			System.out.println("索引删除成功: " + acknowledged);
			} catch (IOException e) {
			e.printStackTrace();
			}
			}
			}
			return true;
			@@ -576,7 +579,8 @@
			*/
			@Async
			public void update(EsParam esParam, T item,List<String> columnList) {
			if (elasticsearchSync) {
			// 判断索引是否存在
			if (elasticsearchSync && isIndexExists(esParam.getIndexName())) {
			// 创建更新请求
			UpdateByQueryRequest updateRequest = new UpdateByQueryRequest(esParam.getIndexName());

			@@ -589,17 +593,17 @@

			Map<String, Object> data = new HashMap<String, Object>();
			data.put("tableName", esParam.getTableName());
			if (esParam.getTableName().equals("jczz_article")){
			setArticleMap((Article)item,data);
			if (esParam.getTableName().equals("jczz_article")) {
			setArticleMap((Article) item, data);
			}
			if (esParam.getTableName().equals("jczz_place")){
			setPlaceMap((PlaceEntity) item,data);
			if (esParam.getTableName().equals("jczz_place")) {
			setPlaceMap((PlaceEntity) item, data);
			}
			if (esParam.getTableName().equals("jczz_house")){
			setHouseMap((HouseEntity) item,data);
			if (esParam.getTableName().equals("jczz_house")) {
			setHouseMap((HouseEntity) item, data);
			}
			if (esParam.getTableName().equals("jczz_household")){
			setHousehouldMap((HouseholdEntity) item,data);
			if (esParam.getTableName().equals("jczz_household")) {
			setHousehouldMap((HouseholdEntity) item, data);
			}
			Map<String, Object> param = new HashMap<String, Object>();
			param.put("data", data);
			@@ -675,7 +679,7 @@
			* 删除数据--根据条件
			*/
			public boolean removeByQuery(EsParam esParam) {
			if (elasticsearchSync) {
			if (elasticsearchSync && isIndexExists(esParam.getIndexName())) {
			DeleteByQueryRequest deleteByQueryRequest = new DeleteByQueryRequest(esParam.getIndexName());
			// 根据多个条件生成 boolQueryBuilder
			BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();

			@@ -85,8 +85,8 @@
			@TableField("event_id")
			private Long eventId;

			/** 事件类型：1：报事报修 */
			@ApiModelProperty(value = "事件类型：1：报事报修", example = "")
			/** 事件类型：1：报事报修 2:E呼即办*/
			@ApiModelProperty(value = "事件类型：1：报事报修 2:E呼即办", example = "")
			@TableField("even_type")
			private Integer evenType;

			@@ -127,5 +127,15 @@
			return R.data(eCallEventService.dataHandle());
			}

			/**
			* e呼即办数据批量分享到圈子
			* @param type
			* @return
			*/
			@GetMapping("/batchShareCircle")
			public R batchShareCircle(Integer type) {
			return R.status(eCallEventService.batchShareCircle(type));
			}


			}

			@@ -46,4 +46,9 @@
			@Param("isAdministrator") Integer isAdministrator);


			/**
			* 查询未分享到圈子的内容
			* @return
			*/
			List<ECallEventEntity> getNotShareCircleList();
			}

			@@ -61,5 +61,13 @@
			order by jece.create_time desc,jece.id desc
			</select>

			<!--查询未分享到圈子的内容-->
			<select id="getNotShareCircleList" resultType="org.springblade.modules.task.entity.ECallEventEntity">
			select
			jece.*
			from jczz_e_call_event jece
			left join jczz_circle jc on jc.event_id = jece.id and jc.even_type = 2 and jc.deleted_falg =0
			where jece.is_deleted = 0 and jc.id is null
			</select>

			</mapper>

			@@ -44,4 +44,11 @@
			* e呼即办数据处理
			*/
			Object dataHandle();

			/**
			* e呼即办数据批量分享到圈子
			* @param type
			* @return
			*/
			boolean batchShareCircle(Integer type);
			}

			@@ -20,7 +20,10 @@
			import org.apache.logging.log4j.util.Strings;
			import org.springblade.common.cache.SysCache;
			import org.springblade.common.param.CommonParamSet;
			import org.springblade.common.utils.SpringUtils;
			import org.springblade.core.secure.utils.AuthUtil;
			import org.springblade.modules.circle.entity.CircleEntity;
			import org.springblade.modules.circle.service.ICircleService;
			import org.springblade.modules.system.entity.Dept;
			import org.springblade.modules.system.service.IDeptService;
			import org.springblade.modules.task.entity.ECallEventEntity;
			@@ -69,4 +72,31 @@
			}
			return null;
			}

			/**
			* e呼即办数据批量分享到圈子
			* @param type 0 :邻里 1协同
			* @return
			*/
			@Override
			public boolean batchShareCircle(Integer type) {
			boolean flag = true;
			ICircleService circleService = SpringUtils.getBean(ICircleService.class);
			// 查询未分享到圈子的内容
			List<ECallEventEntity> list = baseMapper.getNotShareCircleList();
			// 遍历插入到圈子表
			for (ECallEventEntity callEventEntity : list) {
			CircleEntity circleEntity = new CircleEntity();
			circleEntity.setEventId(callEventEntity.getId());
			circleEntity.setEvenType(2);
			circleEntity.setCommunityCode(callEventEntity.getCommunityCode());
			circleEntity.setCircleType(type);
			circleEntity.setCircleText(callEventEntity.getRemark());
			circleEntity.setHouseCode(callEventEntity.getAddressCode());
			circleEntity.setCircleImages(callEventEntity.getImageUrls());
			// 保存
			circleService.saveCircle(circleEntity);
			}
			return flag;
			}
			}

			@@ -75,6 +75,6 @@
			#es
			elasticsearch:
			enabled: false
			host: localhost
			sync: false
			host: 127.0.0.1
			sync: true
			indexName: jczz