[修复]调用技术服务维保记录

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/controller/enforce/obj/EnforceObjExtendController.java

@@ -0,0 +1,51 @@
+package com.zfjg.manage.controller.enforce.obj;
+
+import com.alibaba.fastjson.JSONObject;
+import com.zfjg.common.core.domain.R;
+import com.zfjg.common.core.web.controller.BaseController;
+import com.zfjg.manage.service.enforce.obj.IEnforceObjServiceExtend;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 执法对象扩展类
+ *
+ * @author xxd
+ */
+@RestController
+@RequestMapping("/enforce-obj/extend")
+@Api(tags = "enforce-obj扩展类")
+public class EnforceObjExtendController extends BaseController {
+    @Resource
+    private IEnforceObjServiceExtend enforceObjServiceExtend;
+
+    /**
+     * 以委托单人位获取机构信息
+     */
+    @ApiOperation(value = "以委托单人位获取机构信息")
+    @GetMapping(value = "/{creditCode}/list")
+    public R<JSONObject> addObjTags(@PathVariable("creditCode") String creditCode,
+                                    @RequestParam(value = "current", defaultValue = "1", required = false) Integer current,
+                                    @RequestParam(value = "size", defaultValue = "10", required = false) Integer size) {
+        JSONObject jsonObject = enforceObjServiceExtend.listOrganizationByCreditCode(creditCode, current, size);
+        return R.ok(jsonObject);
+    }
+
+    /**
+     * 获取机构信息记录
+     */
+    @ApiOperation(value = "获取机构信息记录")
+    @GetMapping(value = "/{creditCode}/maintenance/list")
+    public R<JSONObject> changeEnforceObjManageStatus(@PathVariable("creditCode") String creditCode,
+                                                      @RequestParam(value = "current", defaultValue = "1", required = false) Integer current,
+                                                      @RequestParam(value = "size", defaultValue = "10", required = false) Integer size
+                                                      ) {
+        JSONObject jsonObject = enforceObjServiceExtend.maintenanceRecordByCreditCode(creditCode, current, size);
+        return R.ok(jsonObject);
+    }
+
+
+}

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/enforce/job/IEnforceJobServiceExtend.java

@@ -0,0 +1,25 @@
+package com.zfjg.manage.service.enforce.job;
+
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * 执法对象扩展功能
+ *
+ * @author 25098
+ */
+public interface IEnforceJobServiceExtend {
+    /**
+     * 以委托单人位获取机构信息
+     *
+     * @param creditCode 信用代码
+     * @return JSON数据
+     */
+    JSONObject listOrganizationByCreditCode(String creditCode);
+
+    /**
+     * 获取机构信息记录
+     * @param creditCode 信用代码
+     * @return JSON数据
+     */
+    JSONObject maintenanceRecordByCreditCode(String creditCode);
+}

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/enforce/obj/IEnforceObjServiceExtend.java

@@ -0,0 +1,25 @@
+package com.zfjg.manage.service.enforce.obj;
+
+import com.alibaba.fastjson.JSONObject;
+
+/**
+ * 执法对象扩展功能
+ *
+ * @author 25098
+ */
+public interface IEnforceObjServiceExtend {
+    /**
+     * 以委托单人位获取机构信息
+     *
+     * @param creditCode 信用代码
+     * @return JSON数据
+     */
+    JSONObject listOrganizationByCreditCode(String creditCode, Integer current, Integer size);
+
+    /**
+     * 获取机构信息记录
+     * @param creditCode 信用代码
+     * @return JSON数据
+     */
+    JSONObject maintenanceRecordByCreditCode(String creditCode, Integer current, Integer size);
+}

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/enforce/obj/EnforceObjServiceImpl.java

@@ -1,12 +1,13 @@
 package com.zfjg.manage.service.impl.enforce.obj;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zfjg.common.core.constant.CacheConstants;
 import com.zfjg.common.core.enums.DeleteStatusEnum;
@@ -28,7 +29,6 @@ import com.zfjg.manage.api.dto.enforce.template.EnforceTemplateDTO;
 import com.zfjg.manage.api.repository.enforce.obj.EnforceObjRepositoryDTO;
 import com.zfjg.manage.api.search.enforce.obj.EnforceObjSearch;
 import com.zfjg.manage.api.vo.enforce.obj.ChangeEnforceObjManageStatusVO;
-import com.zfjg.manage.config.Constant;
 import com.zfjg.manage.mapper.enforce.job.EnforceJobNodeItemMapper;
 import com.zfjg.manage.mapper.enforce.obj.EnforceObjMapper;
 import com.zfjg.manage.repository.EnforceObjRepository;
@@ -60,7 +60,7 @@ import java.util.stream.Collectors;
  * @date 2022-12-06
  */
 @Service
-public class EnforceObjServiceImpl extends ServiceImpl<EnforceObjMapper, EnforceObj> implements IEnforceObjService {
+public class EnforceObjServiceImpl extends ServiceImpl<EnforceObjMapper, EnforceObj> implements IEnforceObjService, IEnforceObjServiceExtend {
     private static final Logger LOGGER = LoggerFactory.getLogger(EnforceObjServiceImpl.class);
 
     @Value("${enforce.root_org_id}")
@@ -135,7 +135,6 @@ public class EnforceObjServiceImpl extends ServiceImpl<EnforceObjMapper, Enforce
     }
 
 
-
     //删除
     @Override
     public void deleteEs(String id) {
@@ -271,7 +270,7 @@ public class EnforceObjServiceImpl extends ServiceImpl<EnforceObjMapper, Enforce
         // 执法机构信息修改时同步标签机构信息
         if (!enforceObj.getEnforceOrgId().equals(enforceObjDTO.getEnforceOrgId())) {
             enforceObjTagService.update(new LambdaUpdateWrapper<EnforceObjTag>()
-                            .set(EnforceObjTag::getEnforceOrgId, enforceObjDTO.getEnforceOrgId())
+                    .set(EnforceObjTag::getEnforceOrgId, enforceObjDTO.getEnforceOrgId())
                     .eq(EnforceObjTag::getEnforceObjId, id)
             );
         }
@@ -994,4 +993,23 @@ public class EnforceObjServiceImpl extends ServiceImpl<EnforceObjMapper, Enforce
         }
     }
 
+    @Override
+    public JSONObject listOrganizationByCreditCode(String creditCode, Integer current, Integer size) {
+        String uri = "http://jsfw.cq119.gov.cn/api/agency-service/agency_xf/api/organization/" + creditCode + "/organization/list";
+        String url = uri + "?current=" + current + "&size=" + size;
+        String response = HttpUtil.createGet(url)
+                .execute()
+                .body();
+        return JSON.parseObject(response);
+    }
+
+    @Override
+    public JSONObject maintenanceRecordByCreditCode(String creditCode, Integer current, Integer size) {
+        String uri = "http://jsfw.cq119.gov.cn/api/agency-service/agency_xf/api/organization//record/" + creditCode + "/list";
+        String url = uri + "?current=" + current + "&size=" + size;
+        String response = HttpUtil.createGet(url)
+                .execute()
+                .body();
+        return JSON.parseObject(response);
+    }
 }