-
+
-
{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
-
+
{{ searchxianshitit }}
+
-
(巡视计划包含客户信息、仓库等)列表
-
+
巡视工单列表
+
@@ -63,14 +63,14 @@
@@ -104,9 +104,10 @@ export default {
return {
btndisabled: false,
viewState: 1, // 1、列表 2、添加 3、修改 4、查看
- isSearchShow: true,
+ isSearchShow: false,
tableLoading: false,
dataList: [],
+ searchxianshitit: '显示查询条件',
queryParams: {
current: 1,
size: 10,
@@ -162,6 +163,15 @@ export default {
break
}
},
+ // 搜索条件效果
+ clicksearchShow() {
+ this.isSearchShow = !this.isSearchShow
+ if (this.isSearchShow) {
+ this.searchxianshitit = '隐藏查询条件'
+ } else {
+ this.searchxianshitit = '显示查询条件'
+ }
+ },
toAdd(row) {
this.viewState = 2
this.$refs['divadd'].showAdd()
diff --git a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchpatrolplan/dispatchpatrolplanAdd.vue b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchpatrolplan/dispatchpatrolplanAdd.vue
index 4e15f298..7392f8ad 100644
--- a/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchpatrolplan/dispatchpatrolplanAdd.vue
+++ b/yxt_supervise/supervise-dispatchcenter/supervise-dispatchcenter-ui/src/views/yxtdispatchcenter/dispatchpatrolplan/dispatchpatrolplanAdd.vue
@@ -15,113 +15,124 @@
-
- (巡视计划包含客户信息、仓库等)
+ {{ searchxianshitit }}
+
+
-
- * 计划名称
+ * 计划名称：
-
+
-
-
-
- * 客户标识
+ * 客户名称：
-
-
+
-
-
-
- * 监管公司id
+ * 巡视类型：
-
-
+
-
-
-
- * 1计划巡视、2专项巡视
-
-
+ * 计划开始日期：
-
-
-
- * 计划开始日期
-
+
-
- * 计划结束日期
+ * 计划编号：
-
-
+
-
-
-
- * 用户联系人
+ * 用户联系人：
-
-
+
-
-
-
- * 用户联系人电话
+ * 用户联系人电话：
-
+
-
-
-
- * 计划编号
+ * 计划结束日期：
-
-
+
-
- * 模板id
+ * 巡视模板：
-
-
+
-
-
-
- * 周期类型(固定间隔周期)
+ * 周期类型：
-
-
+
-
-
-
- * 巡检周期
+ * 巡检周期：
-
+
+
+ * 周期值：
+
+
-
- * 周期值
+ * 周期值：
-
-
+
+
+
+
+
+
+
+
@@ -134,12 +145,15 @@ export default {
data() {
return {
submitdisabled: false,
+ isSearchShow: false,
viewTitle: '',
+ searchxianshitit: '显示添加条件',
formobj: {
id: '',
sid: '',
planname: '', // 计划名称
custid: '', // 客户标识
+ custname: '', // 客户名称
supervisesid: '', // 监管公司id
patroltype: '', // 1计划巡视、2专项巡视
startdate: '', // 计划开始日期
@@ -150,13 +164,24 @@ export default {
templateid: '', // 模板id
cycletype: '', // 周期类型(固定间隔周期)
cycle: '', // 巡检周期
- cyclevalue: '' // 周期值
+ cyclevalue: '', // 周期值
+ workers:[
+ {
+ principalname:'1',//巡视人名称
+ principalsid:'1',//巡视人sid
+ principalcontact:'1',//联系方式
+ executorname:'1',//是否负责人
+ executornamekey:'1',//是否负责人key
+ workteam:'1',//班组组织
+ workteamid:'110',//班组组织id
+ }
+ ]
},
rules: {
planname: [{ required: true, message: '计划名称不能为空', trigger: 'blur' }], // 计划名称
- custid: [{ required: true, message: '客户标识不能为空', trigger: 'blur' }], // 客户标识
+ custname: [{ required: true, message: '客户标识不能为空', trigger: 'blur' }], // 客户名称
supervisesid: [{ required: true, message: '监管公司id不能为空', trigger: 'blur' }], // 监管公司id
- patroltype: [{ required: true, message: '1计划巡视、2专项巡视不能为空', trigger: 'blur' }], // 1计划巡视、2专项巡视
+ patroltype: [{ required: true, message: '1计划巡视、2专项巡视不能为空', trigger: 'blur' }], // 计划类型
startdate: [{ required: true, message: '计划开始日期不能为空', trigger: 'blur' }], // 计划开始日期
enddate: [{ required: true, message: '计划结束日期不能为空', trigger: 'blur' }], // 计划结束日期
contactperson: [{ required: true, message: '用户联系人不能为空', trigger: 'blur' }], // 用户联系人
@@ -175,9 +200,9 @@ export default {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj.id = ''
this.formobj.sid = '' // SID
-
this.planname = '' // 计划名称
- this.custid = '' // 客户标识
+ this.custname = '' // 客户名称
+ this.custid = '' // 客户ID
this.supervisesid = '' // 监管公司id
this.patroltype = '' // 1计划巡视、2专项巡视
this.startdate = '' // 计划开始日期
@@ -193,17 +218,26 @@ export default {
this.$refs['form_obj'].resetFields()
this.$emit('doback')
},
+ // 搜索条件效果
+ clicksearchShow() {
+ this.isSearchShow = !this.isSearchShow
+ if (this.isSearchShow) {
+ this.searchxianshitit = '隐藏添加条件'
+ } else {
+ this.searchxianshitit = '显示添加条件'
+ }
+ },
showAdd() {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
- this.viewTitle = '【新增】(巡视计划包含客户信息、仓库等)'
+ this.viewTitle = '【新增】计划'
},
showEdit(row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
- this.viewTitle = '【修改】(巡视计划包含客户信息、仓库等)'
+ this.viewTitle = '【修改】计划'
const _this = this
req
.fetchBySid(row.sid)
@@ -212,9 +246,8 @@ export default {
const vdata = resp.data
_this.formobj.id = vdata.id
_this.formobj.sid = vdata.sid // SID
-
_this.formobj.planname = vdata.planname // 计划名称
- _this.formobj.custid = vdata.custid // 客户标识
+ _this.formobj.custname = vdata.custid // 客户标识
_this.formobj.supervisesid = vdata.supervisesid // 监管公司id
_this.formobj.patroltype = vdata.patroltype // 1计划巡视、2专项巡视
_this.formobj.startdate = vdata.startdate // 计划开始日期
@@ -262,4 +295,5 @@ export default {
}
-
+
diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskData.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskData.java
new file mode 100644
index 00000000..5f82251c
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskData.java
@@ -0,0 +1,30 @@
+package com.supervise.rms.api.businessriskdata;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-06-06-14:46
+ */
+@Data
+@ApiModel(value = "任务执行数据表", description = "任务执行数据表")
+@TableName("business_risk_data")
+public class BusinessRiskData extends BaseEntity {
+ //列入经营异常名录原因
+ private String addReason;
+ //列入日期
+ private String addDate;
+ //移出经营异常名录原因（保留字段）
+ private String romoveReason;
+ //移出日期（保留字段)
+ private String removeDate;
+ //作出决定机关
+ private String decisionOffice;
+ //移出决定机关（保留字段）
+ private String removeDecisionOffice;
+ //企业时间Sid
+ private String buSid;
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskDataDto.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskDataDto.java
new file mode 100644
index 00000000..abe70689
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskDataDto.java
@@ -0,0 +1,32 @@
+package com.supervise.rms.api.businessriskdata;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-06-06-14:53
+ */
+@Data
+public class BusinessRiskDataDto implements Dto {
+ private Integer id;
+ private String sid;
+
+ //列入经营异常名录原因
+ private String addReason;
+ //列入日期
+ private String addDate;
+ //移出经营异常名录原因（保留字段）
+ private String romoveReason;
+ //移出日期（保留字段)
+ private String removeDate;
+ //作出决定机关
+ private String decisionOffice;
+ //移出决定机关（保留字段）
+ private String removeDecisionOffice;
+ //企业时间Sid
+ private String buSid;
+
+ //状态码
+ private String Status;
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskDataQuery.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskDataQuery.java
new file mode 100644
index 00000000..d1777ddf
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskDataQuery.java
@@ -0,0 +1,31 @@
+package com.supervise.rms.api.businessriskdata;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-06-06-16:22
+ */
+@Data
+public class BusinessRiskDataQuery implements Query {
+ private Integer id;
+ private String sid;
+
+ //列入经营异常名录原因
+ private String addReason;
+ //列入日期
+ private String addDate;
+ //移出经营异常名录原因（保留字段）
+ private String romoveReason;
+ //移出日期（保留字段)
+ private String removeDate;
+ //作出决定机关
+ private String decisionOffice;
+ //移出决定机关（保留字段）
+ private String removeDecisionOffice;
+ //企业时间Sid
+ private String buSid;
+ //企业名称
+ private String businessName;
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskDataVo.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskDataVo.java
new file mode 100644
index 00000000..5140c8e6
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdata/BusinessRiskDataVo.java
@@ -0,0 +1,31 @@
+package com.supervise.rms.api.businessriskdata;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-06-06-16:22
+ */
+@Data
+public class BusinessRiskDataVo implements Vo {
+ private Integer id;
+ private String sid;
+
+ //列入经营异常名录原因
+ private String addReason;
+ //列入日期
+ private String addDate;
+ //移出经营异常名录原因（保留字段）
+ private String romoveReason;
+ //移出日期（保留字段)
+ private String removeDate;
+ //作出决定机关
+ private String decisionOffice;
+ //移出决定机关（保留字段）
+ private String removeDecisionOffice;
+ //企业时间Sid
+ private String buSid;
+ private String businessName;
+ private String executionTime;
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdate/BusinessRiskDate.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdate/BusinessRiskDate.java
new file mode 100644
index 00000000..3a719e96
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdate/BusinessRiskDate.java
@@ -0,0 +1,22 @@
+package com.supervise.rms.api.businessriskdate;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.supervise.rms.api.businessriskdata.BusinessRiskDataDto;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author feikefei
+ * @create 2023-06-06-14:48
+ */
+@Data
+@ApiModel(value = "任务执行时间表", description = "任务执行时间表")
+@TableName("business_risk_date")
+public class BusinessRiskDate extends BaseEntity {
+ private String executionTime;
+ private String businessName;
+ private List
dataList;
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdate/BusinessRiskDateDto.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdate/BusinessRiskDateDto.java
new file mode 100644
index 00000000..2f4713f1
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/businessriskdate/BusinessRiskDateDto.java
@@ -0,0 +1,20 @@
+package com.supervise.rms.api.businessriskdate;
+
+import com.supervise.rms.api.businessriskdata.BusinessRiskDataDto;
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author feikefei
+ * @create 2023-06-06-14:50
+ */
+@Data
+public class BusinessRiskDateDto implements Dto {
+ private Integer id;
+ private String sid;
+ private String executionTime;
+ private String businessName;
+ private List dataList;
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/enterpriseinformation/EnterpriseInformation.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/enterpriseinformation/EnterpriseInformation.java
new file mode 100644
index 00000000..ead5925a
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/enterpriseinformation/EnterpriseInformation.java
@@ -0,0 +1,42 @@
+package com.supervise.rms.api.enterpriseinformation;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-06-07-9:17
+ */
+@Data
+@ApiModel(value = "企业信息表", description = "企业信息表")
+@TableName("enterprise_information")
+public class EnterpriseInformation extends BaseEntity {
+ //企业名称
+ private String enterpriseName;
+ //企业简称
+ private String enterpriseAbbreviation;
+ //银行账户
+ private String bankAccount;
+ //账号
+ private String accountNumber;
+ //开户行
+ private String openingBankName;
+ //法人
+ private String juridicalPerson;
+ //营业执照号
+ private String businessLicenseNumber;
+ //地址
+ private String address;
+ //省
+ private String province;
+ //市
+ private String city;
+ //区
+ private String county;
+ //联系人
+ private String contacts;
+ //电话
+ private String telephone;
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierFeignFallback.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierFeignFallback.java
index b510d84d..590614cc 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierFeignFallback.java
+++ b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/supplier/SupplierFeignFallback.java
@@ -1,7 +1,24 @@
package com.supervise.rms.api.supplier;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
@Component
public class SupplierFeignFallback implements SupplierFeign {
+ @Override
+ public ResultBean saveSupplier(SupplierDto supplierDto) {
+ return null;
+ }
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq) {
+ return null;
+ }
+
+ @Override
+ public ResultBean fetchDetailsBySid(String sid) {
+ return null;
+ }
}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataMapper.java
new file mode 100644
index 00000000..b69d4f0c
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataMapper.java
@@ -0,0 +1,20 @@
+package com.supervise.rms.biz.businessriskdata;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.supervise.rms.api.businessriskdata.BusinessRiskData;
+import com.supervise.rms.api.businessriskdata.BusinessRiskDataVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author feikefei
+ * @create 2023-06-06-15:48
+ */
+@Mapper
+public interface BusinessRiskDataMapper extends BaseMapper {
+
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataMapper.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataMapper.xml
new file mode 100644
index 00000000..2fe9d7b3
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataMapper.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ select e.businessName,e.executionTime,a.*
+ from business_risk_date e
+ left join business_risk_data a on e.sid = a.buSid
+
+ ${ew.sqlSegment}
+
+
+
\ No newline at end of file
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataRest.java
new file mode 100644
index 00000000..0e932d04
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataRest.java
@@ -0,0 +1,35 @@
+package com.supervise.rms.biz.businessriskdata;
+
+import com.supervise.rms.api.businessriskdata.BusinessRiskDataQuery;
+import com.supervise.rms.api.businessriskdata.BusinessRiskDataVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author feikefei
+ * @create 2023-06-06-15:44
+ */
+@Api(tags = "任务执行数据表")
+@RestController("com.supervise.rmc.biz.businessriskdata.BusinessRiskDataRest")
+@RequestMapping("v1/businessData")
+public class BusinessRiskDataRest {
+
+ @Autowired
+ private BusinessRiskDataService businessRiskDataService;
+
+ @ApiOperation("查询该企业信息")
+ @PostMapping("/listPage")
+ public ResultBean listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo vo = businessRiskDataService.listPage(pq);
+ return rb.success().setData(vo);
+ }
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataService.java
new file mode 100644
index 00000000..7bb0f105
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdata/BusinessRiskDataService.java
@@ -0,0 +1,42 @@
+package com.supervise.rms.biz.businessriskdata;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.supervise.rms.api.businessriskdata.BusinessRiskData;
+import com.supervise.rms.api.businessriskdata.BusinessRiskDataDto;
+import com.supervise.rms.api.businessriskdata.BusinessRiskDataQuery;
+import com.supervise.rms.api.businessriskdata.BusinessRiskDataVo;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author feikefei
+ * @create 2023-06-06-15:48
+ */
+@Service
+public class BusinessRiskDataService extends MybatisBaseService {
+
+ public void save(BusinessRiskDataDto dto){
+ BusinessRiskData data = new BusinessRiskData();
+ BeanUtil.copyProperties(dto,data);
+ baseMapper.insert(data);
+ }
+
+ public PagerVo listPage(PagerQuery pq){
+ BusinessRiskDataQuery params = pq.getParams();
+ QueryWrapper wq = new QueryWrapper<>();
+ if (StringUtils.isNotNull(params.getBusinessName())){
+// wq.eq("",params.getBusinessName());
+ }
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage iPage = baseMapper.selectPageVo(page, wq);
+ PagerVo vo = PagerUtil.pageToVo(iPage, null);
+ return vo;
+ }
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateMapper.java
new file mode 100644
index 00000000..0ebe6303
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateMapper.java
@@ -0,0 +1,13 @@
+package com.supervise.rms.biz.businessriskdate;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.supervise.rms.api.businessriskdate.BusinessRiskDate;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author feikefei
+ * @create 2023-06-06-15:48
+ */
+@Mapper
+public interface BusinessRiskDateMapper extends BaseMapper {
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateRest.java
new file mode 100644
index 00000000..f842a3f4
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateRest.java
@@ -0,0 +1,16 @@
+package com.supervise.rms.biz.businessriskdate;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author feikefei
+ * @create 2023-06-06-15:44
+ */
+@Api(tags = "任务执行数据表")
+@RestController("com.supervise.rmc.biz.businessriskdate.BusinessRiskDateRest")
+@RequestMapping("v1/businessDate")
+public class BusinessRiskDateRest {
+
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateService.java
new file mode 100644
index 00000000..01c3eff7
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/businessriskdate/BusinessRiskDateService.java
@@ -0,0 +1,36 @@
+package com.supervise.rms.biz.businessriskdate;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.supervise.rms.api.businessriskdata.BusinessRiskData;
+import com.supervise.rms.api.businessriskdata.BusinessRiskDataDto;
+import com.supervise.rms.api.businessriskdate.BusinessRiskDate;
+import com.supervise.rms.api.businessriskdate.BusinessRiskDateDto;
+import com.supervise.rms.biz.businessriskdata.BusinessRiskDataService;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author feikefei
+ * @create 2023-06-06-15:48
+ */
+@Service
+public class BusinessRiskDateService extends MybatisBaseService {
+
+ @Autowired
+ private BusinessRiskDataService businessRiskDataService;
+
+ public void save(BusinessRiskDateDto dto){
+ BusinessRiskDate date = new BusinessRiskDate();
+ BeanUtil.copyProperties(dto,date,"id","sid");
+ baseMapper.insert(date);
+ List dataList = dto.getDataList();
+ for (BusinessRiskDataDto businessRiskDataDto : dataList) {
+ businessRiskDataDto.setBuSid(date.getSid());
+ businessRiskDataService.save(businessRiskDataDto);
+ }
+ }
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/datareport/DataReportMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/datareport/DataReportMapper.java
index 00dcc731..3660c158 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/datareport/DataReportMapper.java
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/datareport/DataReportMapper.java
@@ -25,11 +25,11 @@
*********************************************************/
package com.supervise.rms.biz.datareport;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.supervise.rms.api.risk.Risk;
+import com.supervise.rms.api.datareport.DataReport;
import org.apache.ibatis.annotations.Mapper;
@Mapper
-public interface DataReportMapper extends BaseMapper {
+public interface DataReportMapper extends BaseMapper {
}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/datareport/DataReportMapper.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/datareport/DataReportMapper.xml
index a3c8532b..1c7d7a18 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/datareport/DataReportMapper.xml
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/datareport/DataReportMapper.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/datareport/DataReportService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/datareport/DataReportService.java
index 0898dfc7..4dd169d0 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/datareport/DataReportService.java
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/datareport/DataReportService.java
@@ -1,11 +1,12 @@
package com.supervise.rms.biz.datareport;
+import com.supervise.rms.api.datareport.DataReport;
import com.supervise.rms.api.risk.Risk;
import com.yxt.common.base.service.MybatisBaseService;
import org.springframework.stereotype.Service;
@Service
-public class DataReportService extends MybatisBaseService {
+public class DataReportService extends MybatisBaseService {
}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/enterpriseinformation/EnterpriseInformationMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/enterpriseinformation/EnterpriseInformationMapper.java
new file mode 100644
index 00000000..855ffb95
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/enterpriseinformation/EnterpriseInformationMapper.java
@@ -0,0 +1,19 @@
+package com.supervise.rms.biz.enterpriseinformation;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.supervise.rms.api.enterpriseinformation.EnterpriseInformation;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * @author feikefei
+ * @create 2023-06-07-9:28
+ */
+@Mapper
+public interface EnterpriseInformationMapper extends BaseMapper {
+
+ @Select("select * from enterprise_information")
+ List enterpriseInformationList();
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/enterpriseinformation/EnterpriseInformationRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/enterpriseinformation/EnterpriseInformationRest.java
new file mode 100644
index 00000000..234b7f97
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/enterpriseinformation/EnterpriseInformationRest.java
@@ -0,0 +1,16 @@
+package com.supervise.rms.biz.enterpriseinformation;
+
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author feikefei
+ * @create 2023-06-07-9:24
+ */
+@Api(tags = "任务执行数据表")
+@RestController("com.supervise.rmc.biz.enterpriseinformation.EnterpriseInformationRest")
+@RequestMapping("v1/enterprise")
+public class EnterpriseInformationRest {
+
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/enterpriseinformation/EnterpriseInformationService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/enterpriseinformation/EnterpriseInformationService.java
new file mode 100644
index 00000000..93665c84
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/enterpriseinformation/EnterpriseInformationService.java
@@ -0,0 +1,20 @@
+package com.supervise.rms.biz.enterpriseinformation;
+
+import com.supervise.rms.api.enterpriseinformation.EnterpriseInformation;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author feikefei
+ * @create 2023-06-07-9:27
+ */
+@Service
+public class EnterpriseInformationService extends MybatisBaseService {
+
+ public List enterpriseInformationList(){
+ List informationList = baseMapper.enterpriseInformationList();
+ return informationList;
+ }
+}
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedbrand/RestrictedBrandMapper.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedbrand/RestrictedBrandMapper.xml
index f01900a5..fafb5151 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedbrand/RestrictedBrandMapper.xml
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedbrand/RestrictedBrandMapper.xml
@@ -1,13 +1,13 @@
-
+
-
+
SELECT * FROM restricted_brand ${ew.sqlSegment}
-
+
SELECT * FROM restricted_brand ${ew.sqlSegment}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedcategory/RestrictedCategoryMapper.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedcategory/RestrictedCategoryMapper.xml
index 454ac247..34c24390 100644
--- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedcategory/RestrictedCategoryMapper.xml
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/restrictedcategory/RestrictedCategoryMapper.xml
@@ -1,13 +1,13 @@
-
+
-
+
SELECT * FROM restricted_category ${ew.sqlSegment}
-
+
SELECT * FROM restricted_category ${ew.sqlSegment}
\ No newline at end of file
diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/config/QichachaConfig.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/config/QichachaConfig.java
new file mode 100644
index 00000000..4d3a4af3
--- /dev/null
+++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/config/QichachaConfig.java
@@ -0,0 +1,234 @@
+package com.supervise.rms.config;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONException;
+import cn.hutool.json.JSONObject;
+import com.alibaba.fastjson.JSON;
+import com.google.gson.Gson;
+import com.supervise.rms.api.businessriskdata.BusinessRiskDataDto;
+import com.supervise.rms.api.businessriskdate.BusinessRiskDateDto;
+import com.supervise.rms.api.enterpriseinformation.EnterpriseInformation;
+import com.supervise.rms.biz.businessriskdate.BusinessRiskDateService;
+import com.supervise.rms.biz.enterpriseinformation.EnterpriseInformationService;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.http.Header;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpHead;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.util.EntityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import java.io.IOException;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author feikefei
+ * @create 2023-06-07-9:37
+ */
+@Component
+@EnableScheduling
+public class QichachaConfig {
+ private static PoolingHttpClientConnectionManager httpClientConnectionManager;
+ @Autowired
+ private EnterpriseInformationService enterpriseInformationService;
+ @Autowired
+ private BusinessRiskDateService businessRiskDateService;
+
+ public static String APPkey = "9214e7ce4a3a483c8c115771a5f018e1";
+ private static final String secretKey = "5827FC97C3DBFBC28444ADD3949C6FD4";
+ public static String URL = "https://api.qichacha.com/ExceptionCheck/GetList";
+
+ //设置连接超时时间，单位毫秒。
+ public final static int CONNECT_TIMEOUT = 30000;
+ //设置从connect Manager获取Connection 超时时间，单位毫秒。这个属性是新加的属性，因为目前版本是可以共享连接池的。
+ public final static int CONNECT_REQUEST_TIMEOUT = 10000;
+ //请求获取数据的超时时间，单位毫秒。 如果访问一个接口，多少时间内无法返回数据，就直接放弃此次调用。
+ public final static int SOCKET_TIMEOUT = 30000;
+
+ //每周日凌晨1点执行
+ @Scheduled(cron = "0 0 1 ? * 1")
+ public void enterpriseRiskInquiry(){
+// String currDay = DateUtil.format(DateUtil.offsetDay(new Date(), -1), "yyyy-MM-dd");
+// List list = enterpriseInformationService.enterpriseInformationList();
+// for (EnterpriseInformation enterpriseInformation : list) {
+// String paramStr = "searchKey=" + enterpriseInformation.getEnterpriseName();
+// String status = "";
+// try {
+// HttpHead reqHeader = new HttpHead();
+// String[] autherHeader = RandomAuthentHeader();
+// reqHeader.setHeader("Token", autherHeader[0]);
+// reqHeader.setHeader("Timespan", autherHeader[1]);
+// final String reqUri = URL.concat("?key=").concat(APPkey).concat("&").concat(paramStr);
+// String tokenJson = httpGet(reqUri, reqHeader.getAllHeaders());
+// System.out.println(String.format("==========================>this is response:{%s}", tokenJson));
+// status = FormartJson(tokenJson, "Status");
+// System.out.println(String.format("==========================>Status:{%s}", status));
+// BusinessRiskDateDto businessRiskDate = new BusinessRiskDateDto();
+// businessRiskDate.setExecutionTime(currDay);
+// businessRiskDate.setBusinessName(enterpriseInformation.getEnterpriseName());
+// //// TODO: 2023/6/7
+//// businessRiskData.setBuSid(businessRiskDate.getSid());
+//// businessRiskDate.setDataList();
+// businessRiskDateService.save(businessRiskDate);
+// }catch (Exception e){
+// e.printStackTrace();
+// }
+// }
+ }
+
+ public static void main(String[] args) throws Exception {
+// List arrayList = new ArrayList();
+// arrayList.add("石家庄瀚川商贸有限公司");
+// arrayList.add("石家庄富荣食品有限公司");
+// arrayList.add("河北昌特汽车贸易有限公司");
+// arrayList.add("河北旭东能源科技有限公司");
+
+// Map map = new HashMap();
+// map.put("searchKey","searchKey=石家庄瀚川商贸有限公司");
+// String uriBuilder = URL;
+// // 2.设置请求参数
+// if (map != null) {
+// // 遍历请求参数
+// for (Map.Entry entry : map.entrySet()) {
+// // 封装请求参数
+// uriBuilder = uriBuilder.concat("?key=").concat(APPKEY).concat("&").concat(entry.getValue().toString());
+// }
+// }
+// System.out.println("输出"+uriBuilder);
+// // 3.创建请求对象httpGet
+// HttpGet httpGet = new HttpGet(uriBuilder);
+// /*
+// * 添加请求头信息
+// */
+// String[] autherHeader = RandomAuthentHeader();
+// httpGet.setHeader("Token", autherHeader[0]);
+// httpGet.setHeader("Timespan", autherHeader[1]);
+//
+// // 3. 使用Httpclient发起请求
+// CloseableHttpClient httpclient = HttpClients.createDefault();
+// RequestConfig requestConfig = RequestConfig.custom()
+// .setConnectTimeout(CONNECT_TIMEOUT)//设置连接超时时间，单位毫秒。
+// .setConnectionRequestTimeout(CONNECT_REQUEST_TIMEOUT)//设置从connect Manager获取Connection 超时时间，单位毫秒。这个属性是新加的属性，因为目前版本是可以共享连接池的。
+// .setSocketTimeout(SOCKET_TIMEOUT)//请求获取数据的超时时间，单位毫秒。 如果访问一个接口，多少时间内无法返回数据，就直接放弃此次调用。
+// .build();
+// httpGet.setConfig(requestConfig);
+// CloseableHttpResponse response = httpclient.execute(httpGet);
+//
+// // 4. 解析返回数据，封装HttpResult
+// // 4.1状态码
+// int code = response.getStatusLine().getStatusCode();
+// // 4.2 响应体内容
+// String body = null;
+// if (response.getEntity() != null) {
+// body = EntityUtils.toString(response.getEntity(), "UTF-8");
+// }
+// System.out.println("************-----------****************");
+// System.out.println(body);
+ String paramStr = "searchKey=石家庄瀚川商贸有限公司";
+ String status = "";
+ try {
+ HttpHead reqHeader = new HttpHead();
+ String[] autherHeader = RandomAuthentHeader();
+ reqHeader.setHeader("Token", autherHeader[0]);
+ reqHeader.setHeader("Timespan", autherHeader[1]);
+ final String reqUri = URL.concat("?key=").concat(APPkey).concat("&").concat(paramStr);
+ String tokenJson = httpGet(reqUri, reqHeader.getAllHeaders());
+ System.out.println(String.format("==========================>this is response:{%s}", tokenJson));
+
+ status = FormartJson(tokenJson, "Status");
+ System.out.println(String.format("==========================>Status:{%s}", status));
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+ // 获取Auth Code
+ protected static final String[] RandomAuthentHeader() {
+ String timeSpan = String.valueOf(System.currentTimeMillis() / 1000);
+ String[] authentHeaders = new String[] { DigestUtils.md5Hex(APPkey.concat(timeSpan).concat(secretKey)).toUpperCase(), timeSpan };
+ return authentHeaders;
+ }
+
+ // 解析JSON
+ protected static String FormartJson(String jsonString, String key) throws JSONException {
+ JSONObject jObject = new JSONObject(jsonString);
+ BusinessRiskDataDto businessRiskDataDto = jObject.toBean(BusinessRiskDataDto.class);
+
+// Gson gson = new Gson();
+// List businessRiskDataDto = gson.fromJson(jsonString, List.class);
+// List riskDataDto = JSON.parseArray(jsonString, BusinessRiskDataDto.class);
+ return (String) jObject.get(key);
+ }
+
+ public static String httpGet(String url, Header[] headers) throws Exception {
+ HttpUriRequest uriRequest = new HttpGet(url);
+ if (null != headers)
+ uriRequest.setHeaders(headers);
+ CloseableHttpClient httpClient = null;
+ try {
+ httpClient = declareHttpClientSSL(url);
+ CloseableHttpResponse httpresponse = httpClient.execute(uriRequest);
+ HttpEntity httpEntity = httpresponse.getEntity();
+ String result = EntityUtils.toString(httpEntity, "utf-8");
+ return result;
+ } catch (ClientProtocolException e) {
+ System.out.println(String.format("http请求失败，uri{%s},exception{%s}", new Object[] { url, e }));
+ } catch (IOException e) {
+ System.out.println(String.format("IO Exception，uri{%s},exception{%s}", new Object[] { url, e }));
+ } finally {
+ if (null != httpClient)
+ httpClient.close();
+ }
+ return null;
+ }
+
+ private static CloseableHttpClient declareHttpClientSSL(String url) {
+ if (url.startsWith("https://")) {
+ return sslClient();
+ } else {
+ return HttpClientBuilder.create().setConnectionManager(httpClientConnectionManager).build();
+ }
+ }
+
+ private static CloseableHttpClient sslClient() {
+ try {
+ SSLContext ctx = SSLContext.getInstance("TLS");
+ X509TrustManager tm = new X509TrustManager() {
+ public X509Certificate[] getAcceptedIssuers() {
+ return null;
+ }
+ public void checkClientTrusted(X509Certificate[] xcs, String str) {
+ }
+ public void checkServerTrusted(X509Certificate[] xcs, String str) {
+ }
+ };
+ ctx.init(null, new TrustManager[] { tm }, null);
+ SSLConnectionSocketFactory sslConnectionSocketFactory = SSLConnectionSocketFactory.getSocketFactory();
+ return HttpClients.custom().setSSLSocketFactory(sslConnectionSocketFactory).build();
+ } catch (NoSuchAlgorithmException e) {
+ throw new RuntimeException(e);
+ } catch (KeyManagementException e) {
+ throw new RuntimeException(e);
+ }
+ }
+}