Commit c51f6085 authored by 耿迪迪's avatar 耿迪迪

监督检查检查任务获取

parent f6da0235
...@@ -28,17 +28,9 @@ import java.util.Map; ...@@ -28,17 +28,9 @@ import java.util.Map;
@RequestMapping("/token") @RequestMapping("/token")
public class TokenController { public class TokenController {
private static final Logger log = LoggerFactory.getLogger(TokenController.class);
@Autowired @Autowired
private OutUtil outUtil; private OutUtil outUtil;
@Autowired
private ITProAppInforBrowseService tProAppInforBrowseService;
@Autowired
private IFProBehInforBrowseService fProBehInforBrowseService;
/** /**
* 获取营业执照 * 获取营业执照
* @return * @return
...@@ -120,71 +112,7 @@ public class TokenController { ...@@ -120,71 +112,7 @@ public class TokenController {
return AjaxResult.success(json); return AjaxResult.success(json);
} }
@GetMapping(value = "/getProfessorInfo")
public AjaxResult getProfessorInfo(@RequestParam(value = "updateTime") String updateTime,@RequestParam(value = "pageIndex") Integer pageIndex,@RequestParam(value = "pageSize") Integer pageSize){
try {
Map<String,Object> map = new HashMap<>();
map.put("updateTime",updateTime);
map.put("pageIndex",pageIndex);
map.put("pageSize",pageSize);
JSONObject json = outUtil.getInfo("professor/application/information","READ",map);
log.info("获取行业专家档案结果=========" + json.toString());
if(null != json && "0".equals(json.getString("resultCode")) && null != json.getJSONArray("data")){
addProfessorInfo(json.getJSONArray("data"));
}
return AjaxResult.success(json);
} catch (Exception e) {
log.error("获取行业专家档案失败",e);
return AjaxResult.error("获取行业专家档案失败");
}
}
/**
* 持久化行业专家档案
* @param data
*/
@Transactional(rollbackFor = Exception.class)
public void addProfessorInfo(JSONArray data) throws IllegalAccessException {
for(int i = 0; i < data.size(); i++){
ProAppInforBrowseVo proAppInforBrowseVo = JSONObject.toJavaObject(data.getJSONObject(i), ProAppInforBrowseVo.class);
TProAppInforBrowse tProAppInforBrowse = new TProAppInforBrowse();
GovernmentDataCopyUtil.copyToLocalData(proAppInforBrowseVo,tProAppInforBrowse);
tProAppInforBrowseService.insertTProAppInforBrowse(tProAppInforBrowse);
}
}
@GetMapping(value = "/getBehaviour")
public AjaxResult getBehaviour(@RequestParam(value = "updateTime") String updateTime,@RequestParam(value = "pageIndex") Integer pageIndex,@RequestParam(value = "pageSize") Integer pageSize){
try {
Map<String,Object> map = new HashMap<>();
map.put("updateTime",updateTime);
map.put("pageIndex",pageIndex);
map.put("pageSize",pageSize);
JSONObject json = outUtil.getInfo("professor/behaviour/information","READ",map);
log.info("获取专家行为档案结果=========" + json.toString());
if(null != json && "0".equals(json.getString("resultCode")) && null != json.getJSONArray("data")){
addBehaviourInfo(json.getJSONArray("data"));
}
return AjaxResult.success(json);
} catch (Exception e) {
log.error("获取行业专家档案失败",e);
return AjaxResult.error("获取专家行为档案失败");
}
}
/**
* 持久化行业专家档案
* @param data
*/
@Transactional(rollbackFor = Exception.class)
public void addBehaviourInfo(JSONArray data) throws IllegalAccessException {
for(int i = 0; i < data.size(); i++){
ProBehInfoBrowseVo proBehInfoBrowseVo = JSONObject.toJavaObject(data.getJSONObject(i), ProBehInfoBrowseVo.class);
FProBehInforBrowse proBehInforBrowse = new FProBehInforBrowse();
GovernmentDataCopyUtil.copyToLocalData(proBehInfoBrowseVo,proBehInforBrowse);
fProBehInforBrowseService.insertFProBehInforBrowse(proBehInforBrowse);
}
}
} }
package com.zehong.web.controller.government;
import com.alibaba.fastjson.JSONObject;
import com.zehong.common.core.domain.AjaxResult;
import com.zehong.system.service.GovernmentSupervisionInfoService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.Map;
/**
* @author geng
* 政府监管平台信息
*/
@RestController
@RequestMapping("/government/supervision")
public class GovernmentSupervisionInfoController {
private static final Logger log = LoggerFactory.getLogger(GovernmentSupervisionInfoController.class);
@Autowired
private GovernmentSupervisionInfoService governmentSupervisionInfoService;
/**
* 获取行业专家档案
* @param updateTime 大于等于更新时间的数据 yyyy-MM-dd HH:mm:ss
* @param pageIndex 页码
* @param pageSize 每页记录数,取值范围: 1~1000
* @return
*/
@GetMapping(value = "/getProfessorInfo")
public AjaxResult getProfessorInfo(@RequestParam(value = "updateTime") String updateTime, @RequestParam(value = "pageIndex") Integer pageIndex, @RequestParam(value = "pageSize") Integer pageSize){
try {
Map<String,Object> map = new HashMap<>();
map.put("updateTime",updateTime);
map.put("pageIndex",pageIndex);
map.put("pageSize",pageSize);
JSONObject json = governmentSupervisionInfoService.getProfessorInfo(map);
return AjaxResult.success(json);
} catch (Exception e) {
log.error("获取行业专家档案失败",e);
return AjaxResult.error("获取行业专家档案失败");
}
}
/**
* 获取专家行为档案
* @param updateTime 大于等于更新时间的数据 yyyy-MM-dd HH:mm:ss
* @param pageIndex 页码
* @param pageSize 每页记录数,取值范围: 1~1000
* @return
*/
@GetMapping(value = "/getBehaviour")
public AjaxResult getBehaviour(@RequestParam(value = "updateTime") String updateTime,@RequestParam(value = "pageIndex") Integer pageIndex,@RequestParam(value = "pageSize") Integer pageSize){
try {
Map<String,Object> map = new HashMap<>();
map.put("updateTime",updateTime);
map.put("pageIndex",pageIndex);
map.put("pageSize",pageSize);
JSONObject json = governmentSupervisionInfoService.getBehaviour(map);
return AjaxResult.success(json);
} catch (Exception e) {
log.error("获取行业专家档案失败",e);
return AjaxResult.error("获取专家行为档案失败");
}
}
/**
* 获取检查任务
* @param updateTime 大于等于更新时间的数据 yyyy-MM-dd HH:mm:ss
* @param pageIndex 页码
* @param pageSize 每页记录数,取值范围: 1~1000
* @return
*/
@GetMapping(value = "/getTask")
public AjaxResult getTask(@RequestParam(value = "updateTime") String updateTime,@RequestParam(value = "pageIndex") Integer pageIndex,@RequestParam(value = "pageSize") Integer pageSize){
try {
Map<String,Object> map = new HashMap<>();
map.put("updateTime",updateTime);
map.put("pageIndex",pageIndex);
map.put("pageSize",pageSize);
JSONObject json = governmentSupervisionInfoService.getTask(map);
return AjaxResult.success(json);
} catch (Exception e) {
log.error("获取检查任务失败",e);
return AjaxResult.error("获取检查任务失败");
}
}
}
...@@ -98,7 +98,16 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter ...@@ -98,7 +98,16 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
// 过滤请求 // 过滤请求
.authorizeRequests() .authorizeRequests()
// 对于登录login 验证码captchaImage 允许匿名访问 // 对于登录login 验证码captchaImage 允许匿名访问
.antMatchers("/login", "/captchaImage","/websocket/**","/websocketServer", "/detector/detectorReport/**","/getout/**","/token/**").anonymous() .antMatchers(
"/login",
"/captchaImage",
"/websocket/**",
"/websocketServer",
"/detector/detectorReport/**",
"/getout/**",
"/token/**",
"/government/supervision/**"
).anonymous()
.antMatchers( .antMatchers(
HttpMethod.GET, HttpMethod.GET,
"/*.html", "/*.html",
......
package com.zehong.system.domain.vo;
public class TInsTaskInforVo {
/**任务唯一编码*/
private String uniqueCode;
/**任务归属*/
private String taskBelong;
/**任务类型 0-专项 1-日常 2-第三方评估抽查 3-随机抽查*/
private String taskType;
/**是否下发*/
private String distributeFlag;
/**任务名称*/
private String name;
/**任务说明*/
private String desc;
/**任务开始时间*/
private String startTime;
/**任务截至时间*/
private String endTime;
/**任务状态*/
private String status;
/**删除标记*/
private String deleteFlag;
/**描述*/
private String remark;
/**创建时间*/
private String createTime;
/**创建人*/
private String createBy;
/**修改时间*/
private String updateTime;
/**修改人*/
private String modifyBy;
public String getUniqueCode() {
return uniqueCode;
}
public void setUniqueCode(String uniqueCode) {
this.uniqueCode = uniqueCode;
}
public String getTaskBelong() {
return taskBelong;
}
public void setTaskBelong(String taskBelong) {
this.taskBelong = taskBelong;
}
public String getTaskType() {
return taskType;
}
public void setTaskType(String taskType) {
this.taskType = taskType;
}
public String getDistributeFlag() {
return distributeFlag;
}
public void setDistributeFlag(String distributeFlag) {
this.distributeFlag = distributeFlag;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
public String getStartTime() {
return startTime;
}
public void setStartTime(String startTime) {
this.startTime = startTime;
}
public String getEndTime() {
return endTime;
}
public void setEndTime(String endTime) {
this.endTime = endTime;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getDeleteFlag() {
return deleteFlag;
}
public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public String getUpdateTime() {
return updateTime;
}
public void setUpdateTime(String updateTime) {
this.updateTime = updateTime;
}
public String getModifyBy() {
return modifyBy;
}
public void setModifyBy(String modifyBy) {
this.modifyBy = modifyBy;
}
}
...@@ -58,4 +58,11 @@ public interface FProBehInforBrowseMapper ...@@ -58,4 +58,11 @@ public interface FProBehInforBrowseMapper
* @return 结果 * @return 结果
*/ */
public int deleteFProBehInforBrowseByIds(Long[] fProBehInforIds); public int deleteFProBehInforBrowseByIds(Long[] fProBehInforIds);
/**
* 批量插入
* @param List 批量数据
* @return
*/
int batchInsertFProBehInforBrowse(List<FProBehInforBrowse> List);
} }
...@@ -2,6 +2,7 @@ package com.zehong.system.mapper; ...@@ -2,6 +2,7 @@ package com.zehong.system.mapper;
import java.util.List; import java.util.List;
import com.zehong.system.domain.TInsTaskInfor; import com.zehong.system.domain.TInsTaskInfor;
import org.apache.ibatis.annotations.Param;
/** /**
* 监督检查-检查任务Mapper接口 * 监督检查-检查任务Mapper接口
...@@ -58,4 +59,11 @@ public interface TInsTaskInforMapper ...@@ -58,4 +59,11 @@ public interface TInsTaskInforMapper
* @return 结果 * @return 结果
*/ */
public int deleteTInsTaskInforByIds(Long[] fInsTaskInforIds); public int deleteTInsTaskInforByIds(Long[] fInsTaskInforIds);
/**
* 批量插入
* @param list 批量数据
* @return
*/
int batchInsertTInsTaskInfo(List<TInsTaskInfor> list);
} }
...@@ -58,4 +58,11 @@ public interface TProAppInforBrowseMapper ...@@ -58,4 +58,11 @@ public interface TProAppInforBrowseMapper
* @return 结果 * @return 结果
*/ */
public int deleteTProAppInforBrowseByIds(Long[] fProAppInforIds); public int deleteTProAppInforBrowseByIds(Long[] fProAppInforIds);
/**
* 批量新增
* @param list 批量数据
* @return
*/
int batchInsertTProAppInforBrowse(List<TProAppInforBrowse> list);
} }
package com.zehong.system.service;
import com.alibaba.fastjson.JSONObject;
import java.util.Map;
/**
* @author geng
* 政府监管平台信息
*/
public interface GovernmentSupervisionInfoService {
/**
* 获取行业专家档案
* @param map 入参
* @return
* @throws Exception
*/
JSONObject getProfessorInfo(Map<String,Object> map) throws Exception;
/**
* 获取专家行为档案
* @param map 入参
* @return
* @throws Exception
*/
JSONObject getBehaviour (Map<String,Object> map) throws Exception;
/**
* 获取检查任务
* @param map 入参
* @return
* @throws Exception
*/
JSONObject getTask (Map<String,Object> map) throws Exception;
}
package com.zehong.system.service.impl;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.zehong.common.utils.GovernmentDataCopyUtil;
import com.zehong.common.utils.GovernmentDataUtil;
import com.zehong.system.domain.FProBehInforBrowse;
import com.zehong.system.domain.TInsTaskInfor;
import com.zehong.system.domain.TProAppInforBrowse;
import com.zehong.system.domain.vo.ProAppInforBrowseVo;
import com.zehong.system.domain.vo.ProBehInfoBrowseVo;
import com.zehong.system.domain.vo.TInsTaskInforVo;
import com.zehong.system.mapper.FProBehInforBrowseMapper;
import com.zehong.system.mapper.TInsTaskInforMapper;
import com.zehong.system.mapper.TProAppInforBrowseMapper;
import com.zehong.system.service.GovernmentSupervisionInfoService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* @author geng
* 政府监管平台信息
*/
@Service
public class GovernmentSupervisionInfoServiceImpl implements GovernmentSupervisionInfoService {
private static final Logger log = LoggerFactory.getLogger(GovernmentSupervisionInfoServiceImpl.class);
@Resource
private GovernmentDataUtil governmentDataUtil;
@Resource
private TProAppInforBrowseMapper tProAppInforBrowseMapper;
@Resource
private FProBehInforBrowseMapper fProBehInforBrowseMapper;
@Resource
private TInsTaskInforMapper tInsTaskInforMapper;
/**
* 获取行业专家档案
* @param map 入参
* @return
* @throws Exception
*/
@Override
@Transactional(rollbackFor = Exception.class)
public JSONObject getProfessorInfo(Map<String, Object> map) throws Exception {
JSONObject json = governmentDataUtil.getInfo("professor/application/information","READ",map);
log.info("获取行业专家档案结果=========" + json.toString());
//结果入库
if(null != json && "0".equals(json.getString("resultCode")) && null != json.getJSONArray("data")){
JSONArray data = json.getJSONArray("data");
List<TProAppInforBrowse> proAppInforBrowseList = new ArrayList<>();
for(int i = 0; i < data.size(); i++){
ProAppInforBrowseVo proAppInforBrowseVo = JSONObject.toJavaObject(data.getJSONObject(i), ProAppInforBrowseVo.class);
TProAppInforBrowse tProAppInforBrowse = new TProAppInforBrowse();
GovernmentDataCopyUtil.copyToLocalData(proAppInforBrowseVo,tProAppInforBrowse);
proAppInforBrowseList.add(tProAppInforBrowse);
}
tProAppInforBrowseMapper.insertTProAppInforBrowse(tProAppInforBrowse);
}
return json;
}
/**
* 获取专家行为档案
* @param map 入参
* @return
* @throws Exception
*/
@Override
@Transactional(rollbackFor = Exception.class)
public JSONObject getBehaviour(Map<String, Object> map) throws Exception {
JSONObject json = governmentDataUtil.getInfo("professor/behaviour/information","READ",map);
log.info("获取专家行为档案结果=========" + json.toString());
if(null != json && "0".equals(json.getString("resultCode")) && null != json.getJSONArray("data")){
JSONArray data = json.getJSONArray("data");
List<FProBehInforBrowse> proBehInforBrowseList = new ArrayList<>();
for(int i = 0; i < data.size(); i++){
ProBehInfoBrowseVo proBehInfoBrowseVo = JSONObject.toJavaObject(data.getJSONObject(i), ProBehInfoBrowseVo.class);
FProBehInforBrowse proBehInforBrowse = new FProBehInforBrowse();
GovernmentDataCopyUtil.copyToLocalData(proBehInfoBrowseVo,proBehInforBrowse);
proBehInforBrowseList.add(proBehInforBrowse);
}
fProBehInforBrowseMapper.batchInsertFProBehInforBrowse(proBehInforBrowseList);
}
return json;
}
/**
* 获取检查任务
* @param map 入参
* @return
* @throws Exception
*/
@Override
@Transactional(rollbackFor = Exception.class)
public JSONObject getTask(Map<String, Object> map) throws Exception {
JSONObject json = governmentDataUtil.getInfo("inspection/task/information","READ",map);
log.info("获取检查任务结果=========" + json.toString());
if(null != json && "0".equals(json.getString("resultCode")) && null != json.getJSONArray("data")){
JSONArray data = json.getJSONArray("data");
List<TInsTaskInfor> taskInforList = new ArrayList<>();
for(int i = 0; i < data.size(); i++){
TInsTaskInforVo tInsTaskInforVo = JSONObject.toJavaObject(data.getJSONObject(i), TInsTaskInforVo.class);
TInsTaskInfor tInsTaskInfor = new TInsTaskInfor();
GovernmentDataCopyUtil.copyToLocalData(tInsTaskInforVo,tInsTaskInfor);
taskInforList.add(tInsTaskInfor);
}
tInsTaskInforMapper.batchInsertTInsTaskInfo(taskInforList);
}
return null;
}
}
...@@ -74,4 +74,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -74,4 +74,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{fProBehInforId} #{fProBehInforId}
</foreach> </foreach>
</delete> </delete>
<insert id="batchInsertFProBehInforBrowse" parameterType="FProBehInforBrowse" useGeneratedKeys="true" keyProperty="fProBehInforId">
insert into f_pro_beh_infor_browse(
f_id_no,
f_exper_eval,
f_selection_event,
f_selection_start_time,
f_scor_desc,
f_update_time
)VALUES
<foreach collection="list" separator="," item="item">
(
#{item.fIdNo},
#{item.fExperEval},
#{item.fSelectionEvent},
#{item.fSelectionStartTime},
#{item.fScorDesc},
#{item.fUpdateTime}
)
</foreach>
</insert>
</mapper> </mapper>
\ No newline at end of file
...@@ -124,4 +124,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -124,4 +124,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{fInsTaskInforId} #{fInsTaskInforId}
</foreach> </foreach>
</delete> </delete>
<insert id="batchInsertTInsTaskInfo" parameterType="TInsTaskInfor" useGeneratedKeys="true" keyProperty="fInsTaskInforId">
insert into t_ins_task_infor(
f_unique_code,
f_task_belong,
f_task_type,
f_distribute_flag,
f_name,
f_desc,
f_start_time,
f_end_time,
f_status,
f_delete_flag,
f_remark,
f_create_time,
f_create_by,
f_update_time,
f_modify_by
)values
<foreach collection="list" separator="," item="item">
(
#{item.fUniqueCode},
#{item.fTaskBelong},
#{item.fTaskType},
#{item.fDistributeFlag},
#{item.fName},
#{item.fDesc},
#{item.fStartTime},
#{item.fEndTime},
#{item.fStatus},
#{item.fDeleteFlag},
#{item.fRemark},
#{item.fCreateTime},
#{item.fCreateBy},
#{item.fUpdateTime},
#{item.fModifyBy}
)
</foreach>
</insert>
</mapper> </mapper>
\ No newline at end of file
...@@ -179,4 +179,76 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -179,4 +179,76 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{fProAppInforId} #{fProAppInforId}
</foreach> </foreach>
</delete> </delete>
<insert id="insertTProAppInforBrowse" parameterType="TProAppInforBrowse" useGeneratedKeys="true" keyProperty="fProAppInforId">
insert into t_pro_app_infor_browse
(
f_code,
f_name,
f_id_no,
f_sex,
f_birthday,
f_email,
f_phone,
f_education,
f_graduation_school,
f_major,
f_graduation_time,
f_ent_uuid,
f_work_unit,
f_work_time,
f_department,
f_duties,
f_major_title,
f_major_now,
f_major_life,
f_gas_type,
f_good_area,
f_learning_work_experience,
f_area,
f_delete_flag,
f_c_record,
f_p_record,
f_picture,
f_update_time,
f_this_province_flag,
f_valid_type,
f_employ_batch
)VALUES
<foreach collection="list" separator="," item="item">
(
#{item.fCode},
#{item.fName},
#{item.fIdNo},
#{item.fSex},
#{item.fBirthday},
#{item.fEmail},
#{item.fPhone},
#{item.fEducation},
#{item.fGraduationSchool},
#{item.fMajor},
#{item.fGraduationTime},
#{item.fEntUuid},
#{item.fWorkUnit},
#{item.fWorkTime},
#{item.fDepartment},
#{item.fDuties},
#{item.fMajorTitle},
#{item.fMajorNow},
#{item.fMajorLife},
#{item.fGasType},
#{item.fGoodArea},
#{item.fLearningWorkExperience},
#{item.fArea},
#{item.fDeleteFlag},
#{item.fCRecord},
#{item.fPRecord},
#{item.fPicture},
#{item.fUpdateTime},
#{item.fThisProvinceFlag},
#{item.fValidType},
#{item.fEmployBatch}
)
</foreach>
</insert>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment