Merge remote-tracking branch 'origin/dev' into dev

pull/4/head
chenxinying 2024-01-31 08:40:39 +08:00
commit e5d7efd3e1
25 changed files with 135 additions and 129 deletions

View File

@ -1,10 +1,10 @@
package com.zcloud.controller.hiddenDangerCheckStandardCustom;
package com.zcloud.controller.hiddenDangerCheckStandard;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.service.corp.CorpInfoService;
import com.zcloud.service.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardCommonService;
import com.zcloud.service.hiddenDangerCheckStandard.CommonService;
import com.zcloud.util.Jurisdiction;
import com.zcloud.util.Tools;
import org.springframework.beans.factory.annotation.Autowired;
@ -12,7 +12,9 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* -
@ -22,10 +24,10 @@ import java.util.*;
*/
@Controller
@RequestMapping("/hiddenstandardCommon")
public class hiddenDangerCheckStandardCommonController extends BaseController {
public class CommonController extends BaseController {
@Autowired
private HiddenDangerCheckStandardCommonService hiddenstandardCommonService;
private CommonService commonService;
@Autowired
private CorpInfoService corpinfoService;
@ -45,7 +47,7 @@ public class hiddenDangerCheckStandardCommonController extends BaseController {
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业
pd = corpinfoService.findById(pd); //根据ID读取
page.setPd(pd);
List<PageData> varList = hiddenstandardCommonService.list(page); //列出RiskCheckItem列表
List<PageData> varList = commonService.list(page); //列出RiskCheckItem列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);

View File

@ -1,26 +1,30 @@
package com.zcloud.controller.hiddenDangerCheckStandardCustom;
package com.zcloud.controller.hiddenDangerCheckStandard;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.logs.LogAnno;
import com.zcloud.service.check.*;
import com.zcloud.service.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardCustomItemService;
import com.zcloud.service.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardCustomService;
import com.zcloud.service.hiddenDangerCheckStandard.CustomItemService;
import com.zcloud.service.hiddenDangerCheckStandard.CustomService;
import com.zcloud.service.offduty.OffDutyService;
import com.zcloud.service.risk.IdentificationPartsService;
import com.zcloud.service.risk.RiskPointService;
import com.zcloud.service.statistics.ListStatisticsService;
import com.zcloud.service.system.DepartmentService;
import com.zcloud.service.system.UsersService;
import com.zcloud.util.*;
import com.zcloud.util.Jurisdiction;
import com.zcloud.util.Tools;
import com.zcloud.util.Warden;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* -
@ -30,12 +34,12 @@ import java.util.*;
*/
@Controller
@RequestMapping("/hiddenstandardCustom")
public class hiddenDangerCheckStandardCustomController extends BaseController {
public class CustomController extends BaseController {
@Autowired
private HiddenDangerCheckStandardCustomService hiddenstandardCustomService;
private CustomService customService;
@Autowired
private HiddenDangerCheckStandardCustomItemService hiddenstandardCustomItemService;
private CustomItemService customItemService;
@Autowired
private ListCheckItemService listcheckitemService;
@Autowired
@ -73,11 +77,11 @@ public class hiddenDangerCheckStandardCustomController extends BaseController {
pd = this.getPageData();
pd.put("CUSTOM_ID", this.get32UUID());
Warden.initDate(pd);
hiddenstandardCustomService.save(pd);
customService.save(pd);
PageData itempd = new PageData();
itempd.putAll(pd);
itempd.put("CUSTOM_ITEM_ID", this.get32UUID());
hiddenstandardCustomItemService.save(itempd);
customItemService.save(itempd);
map.put("result", errInfo);
return map;
}
@ -98,7 +102,7 @@ public class hiddenDangerCheckStandardCustomController extends BaseController {
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if(Tools.notEmpty(KEYWORDS))npd.put("KEYWORDS", KEYWORDS.trim());
List<PageData> varList = hiddenstandardCustomService.listAll(pd);
List<PageData> varList = customService.listAll(pd);
map.put("varList", varList);
map.put("result", errInfo);
return map;

View File

@ -1,8 +1,8 @@
package com.zcloud.controller.hiddenDangerCheckStandardCustom;
package com.zcloud.controller.hiddenDangerCheckStandard;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.PageData;
import com.zcloud.service.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardDictionaryService;
import com.zcloud.service.hiddenDangerCheckStandard.StandardDictionaryService;
import com.zcloud.util.Jurisdiction;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
@ -21,10 +21,10 @@ import java.util.Map;
*/
@Controller
@RequestMapping("/hiddenstandardDictionary")
public class hiddenDangerCheckStandardDictionaryController extends BaseController {
public class StandardDictionaryController extends BaseController {
@Autowired
private HiddenDangerCheckStandardDictionaryService hiddenstandardDictionaryService;
private StandardDictionaryService dictionaryService;
/**
@ -42,7 +42,7 @@ public class hiddenDangerCheckStandardDictionaryController extends BaseControlle
PageData pd = new PageData();
pd = this.getPageData();
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
List<PageData> varList = hiddenstandardDictionaryService.list(pd);
List<PageData> varList = dictionaryService.list(pd);
map.put("varList", varList);
map.put("result", errInfo);
return map;

View File

@ -1,4 +1,4 @@
package com.zcloud.mapper.datasource.hiddenDangerCheckStandardCustom;
package com.zcloud.mapper.datasource.hiddenDangerCheckStandard;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -11,7 +11,7 @@ import java.util.List;
* 2020-12-30
* www.zcloudchina.com
*/
public interface HiddenDangerCheckStandardCommonMapper {
public interface CommonMapper {
/**
* @param page

View File

@ -1,4 +1,4 @@
package com.zcloud.mapper.datasource.hiddenDangerCheckStandardCustom;
package com.zcloud.mapper.datasource.hiddenDangerCheckStandard;
import com.zcloud.entity.PageData;
@ -8,7 +8,7 @@ import com.zcloud.entity.PageData;
* 2020-12-30
* www.zcloudchina.com
*/
public interface HiddenDangerCheckStandardCustomItemMapper {
public interface CustomItemMapper {
/**
* @param pd

View File

@ -1,4 +1,4 @@
package com.zcloud.mapper.datasource.hiddenDangerCheckStandardCustom;
package com.zcloud.mapper.datasource.hiddenDangerCheckStandard;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -11,7 +11,7 @@ import java.util.List;
* 2020-12-30
* www.zcloudchina.com
*/
public interface HiddenDangerCheckStandardCustomMapper {
public interface CustomMapper {
/**
* @param pd

View File

@ -1,4 +1,4 @@
package com.zcloud.mapper.datasource.hiddenDangerCheckStandardCustom;
package com.zcloud.mapper.datasource.hiddenDangerCheckStandard;
import com.zcloud.entity.PageData;

View File

@ -1,4 +1,4 @@
package com.zcloud.mapper.datasource.hiddenDangerCheckStandardCustom;
package com.zcloud.mapper.datasource.hiddenDangerCheckStandard;
import com.zcloud.entity.PageData;
@ -10,7 +10,7 @@ import java.util.List;
* 2020-12-30
* www.zcloudchina.com
*/
public interface HiddenDangerCheckStandardDictionaryMapper {
public interface StandardDictionaryMapper {
/**()
* @param pd

View File

@ -1,4 +1,4 @@
package com.zcloud.service.hiddenDangerCheckStandardCustom;
package com.zcloud.service.hiddenDangerCheckStandard;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@ -11,7 +11,7 @@ import java.util.List;
* 2020-12-30
* www.zcloudchina.com
*/
public interface HiddenDangerCheckStandardCommonService {
public interface CommonService {
/**
* @param page

View File

@ -1,4 +1,4 @@
package com.zcloud.service.hiddenDangerCheckStandardCustom;
package com.zcloud.service.hiddenDangerCheckStandard;
import com.zcloud.entity.PageData;
@ -8,7 +8,7 @@ import com.zcloud.entity.PageData;
* 2020-12-30
* www.zcloudchina.com
*/
public interface HiddenDangerCheckStandardCustomItemService {
public interface CustomItemService {
/**

View File

@ -1,4 +1,4 @@
package com.zcloud.service.hiddenDangerCheckStandardCustom;
package com.zcloud.service.hiddenDangerCheckStandard;
import com.zcloud.entity.PageData;
@ -10,7 +10,7 @@ import java.util.List;
* 2020-12-30
* www.zcloudchina.com
*/
public interface HiddenDangerCheckStandardCustomService {
public interface CustomService {
/**
* @param pd

View File

@ -1,4 +1,4 @@
package com.zcloud.service.hiddenDangerCheckStandardCustom;
package com.zcloud.service.hiddenDangerCheckStandard;
import com.zcloud.entity.PageData;

View File

@ -1,4 +1,4 @@
package com.zcloud.service.hiddenDangerCheckStandardCustom;
package com.zcloud.service.hiddenDangerCheckStandard;
import com.zcloud.entity.PageData;
@ -10,7 +10,7 @@ import java.util.List;
* 2020-12-30
* www.zcloudchina.com
*/
public interface HiddenDangerCheckStandardDictionaryService {
public interface StandardDictionaryService {
/**()
* @param pd

View File

@ -1,9 +1,9 @@
package com.zcloud.service.hiddenDangerCheckStandardCustom.impl;
package com.zcloud.service.hiddenDangerCheckStandard.impl;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardCommonMapper;
import com.zcloud.service.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardCommonService;
import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.CommonMapper;
import com.zcloud.service.hiddenDangerCheckStandard.CommonService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -18,17 +18,17 @@ import java.util.List;
*/
@Service
@Transactional //开启事物
public class HiddenDangerCheckStandardCommonServiceImpl implements HiddenDangerCheckStandardCommonService {
public class CommonServiceImpl implements CommonService {
@Autowired
private HiddenDangerCheckStandardCommonMapper hiddenstandardCommonMapper;
private CommonMapper commonMapper;
/**
* @param page
* @throws Exception
*/
public List<PageData> list(Page page)throws Exception{
return hiddenstandardCommonMapper.datalistPage(page);
return commonMapper.datalistPage(page);
}
}

View File

@ -0,0 +1,34 @@
package com.zcloud.service.hiddenDangerCheckStandard.impl;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.CustomItemMapper;
import com.zcloud.service.hiddenDangerCheckStandard.CustomItemService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
* -
* luoxiaobao
* 2020-12-30
* www.zcloudchina.com
*/
@Service
@Transactional //开启事物
public class CustomItemServiceImpl implements CustomItemService {
@Autowired
private CustomItemMapper customItemMapper;
/**
* @param pd
* @throws Exception
*/
public void save(PageData pd)throws Exception{
customItemMapper.save(pd);
}
}

View File

@ -1,8 +1,8 @@
package com.zcloud.service.hiddenDangerCheckStandardCustom.impl;
package com.zcloud.service.hiddenDangerCheckStandard.impl;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardCustomMapper;
import com.zcloud.service.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardCustomService;
import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.CustomMapper;
import com.zcloud.service.hiddenDangerCheckStandard.CustomService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -17,10 +17,10 @@ import java.util.List;
*/
@Service
@Transactional //开启事物
public class HiddenDangerCheckStandardCustomServiceImpl implements HiddenDangerCheckStandardCustomService {
public class CustomServiceImpl implements CustomService {
@Autowired
private HiddenDangerCheckStandardCustomMapper hiddencheckstandardCustomMapper;
private CustomMapper customMapper;
/**
@ -28,7 +28,7 @@ public class HiddenDangerCheckStandardCustomServiceImpl implements HiddenDangerC
* @throws Exception
*/
public void save(PageData pd)throws Exception{
hiddencheckstandardCustomMapper.save(pd);
customMapper.save(pd);
}
/**
@ -36,7 +36,7 @@ public class HiddenDangerCheckStandardCustomServiceImpl implements HiddenDangerC
* @throws Exception
*/
public List<PageData> listAll(PageData pd)throws Exception{
return hiddencheckstandardCustomMapper.listAll(pd);
return customMapper.listAll(pd);
}
}

View File

@ -1,8 +1,8 @@
package com.zcloud.service.hiddenDangerCheckStandardCustom.impl;
package com.zcloud.service.hiddenDangerCheckStandard.impl;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.hiddenDangerCheckStandardCustom.ListCheckStandardItemMapper;
import com.zcloud.service.hiddenDangerCheckStandardCustom.ListcheckstandarditemService;
import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.ListCheckStandardItemMapper;
import com.zcloud.service.hiddenDangerCheckStandard.ListcheckstandarditemService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

View File

@ -0,0 +1,34 @@
package com.zcloud.service.hiddenDangerCheckStandard.impl;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.StandardDictionaryMapper;
import com.zcloud.service.hiddenDangerCheckStandard.StandardDictionaryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
*
* luoxiaobao
* 2020-12-30
* www.zcloudchina.com
*/
@Service
@Transactional //开启事物
public class StandardDictionaryServiceImpl implements StandardDictionaryService {
@Autowired
private StandardDictionaryMapper dictionaryMapper;
/**()
* @param pd
* @throws Exception
*/
public List<PageData> list(PageData pd)throws Exception{
return dictionaryMapper.list(pd);
}
}

View File

@ -1,34 +0,0 @@
package com.zcloud.service.hiddenDangerCheckStandardCustom.impl;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardCustomItemMapper;
import com.zcloud.service.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardCustomItemService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
* -
* luoxiaobao
* 2020-12-30
* www.zcloudchina.com
*/
@Service
@Transactional //开启事物
public class HiddenDangerCheckStandardCustomItemServiceImpl implements HiddenDangerCheckStandardCustomItemService {
@Autowired
private HiddenDangerCheckStandardCustomItemMapper hiddenstandardCustomItemMapper;
/**
* @param pd
* @throws Exception
*/
public void save(PageData pd)throws Exception{
hiddenstandardCustomItemMapper.save(pd);
}
}

View File

@ -1,34 +0,0 @@
package com.zcloud.service.hiddenDangerCheckStandardCustom.impl;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardDictionaryMapper;
import com.zcloud.service.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardDictionaryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
*
* luoxiaobao
* 2020-12-30
* www.zcloudchina.com
*/
@Service
@Transactional //开启事物
public class HiddenDangerCheckStandardDictionaryServiceImpl implements HiddenDangerCheckStandardDictionaryService {
@Autowired
private HiddenDangerCheckStandardDictionaryMapper hiddenstandardDictionaryMapper;
/**()
* @param pd
* @throws Exception
*/
public List<PageData> list(PageData pd)throws Exception{
return hiddenstandardDictionaryMapper.list(pd);
}
}

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zcloud.mapper.datasource.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardCommonMapper">
<mapper namespace="com.zcloud.mapper.datasource.hiddenDangerCheckStandard.CommonMapper">
<!--表名 -->
<sql id="tableName">

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace="com.zcloud.mapper.datasource.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardCustomItemMapper">
namespace="com.zcloud.mapper.datasource.hiddenDangerCheckStandard.CustomItemMapper">
<!--表名 -->
<sql id="tableName">

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace="com.zcloud.mapper.datasource.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardCustomMapper">
namespace="com.zcloud.mapper.datasource.hiddenDangerCheckStandard.CustomMapper">
<!--表名 -->
<sql id="tableName">

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zcloud.mapper.datasource.hiddenstandardCustom.ListCheckStandardItemMapper">
<mapper namespace="com.zcloud.mapper.datasource.hiddenDangerCheckStandard.ListCheckStandardItemMapper">
<!--表名 -->
<sql id="tableName">

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zcloud.mapper.datasource.hiddenDangerCheckStandardCustom.HiddenDangerCheckStandardDictionaryMapper">
<mapper namespace="com.zcloud.mapper.datasource.hiddenDangerCheckStandard.StandardDictionaryMapper">
<!--表名 -->
<sql id="tableName">