Merge branch 'develop_master' into develop_migration

# Conflicts: # adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
2021-08-23 17:55:37 +08:00
parent 316fde8563 e92b03a295
commit 4a11cd9c9b
37 changed files with 693 additions and 1059 deletions
@@ -1,7 +1,6 @@
 package com.adc.da.slrs.sarBussionessStand.controller;


-import com.adc.da.common.ReadExcel;
 import com.adc.da.person.service.IPersonCollectEOService;
 import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
 import com.adc.da.slrs.sarResource.entity.TsResource;
@@ -15,27 +14,17 @@ import com.adc.da.http.PageInfo;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.util.LoginUserUtil;
-import com.adc.da.util.exception.AdcDaBaseException;
-import com.adc.da.util.utils.IOUtils;
 import com.adc.da.util.utils.StringUtils;
-import com.adc.da.utils.util.BussStandExportUtil;
 import com.adc.da.utils.util.SarAdvanceSearchUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.ApiOperation;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
 import io.swagger.annotations.Api;
 import com.adc.da.base.web.BaseController;

-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.OutputStream;
 import java.util.Date;
 import java.util.List;

@@ -52,8 +41,6 @@ import java.util.List;
@RequestMapping("/${restPath}/lawss/sarBussionessStand")
 public class SarBussionessStandController extends BaseController<SarBussionessStand> {

-    private static final Logger logger = LoggerFactory.getLogger(SarBussionessStandController.class);
-
    @Autowired
    private ISarBussionessStandService sarBussionessStandEOService;

@@ -70,54 +57,6 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
    @Autowired
    private IDicTypeEOService dicTypeEOService;

-    @ApiOperation(value = "|SarBussionessStandEO|删除")
-    @PostMapping("deleteSarBussionessStand")
-    //401问题2021-03-31暂时注释掉 liuhuiwen
-//    @RequiresPermissions("lawss:sarBussionessStand:delete")
-    public ResponseMessage delete(String ids) throws Exception {
-        SarBussionessStandEOPage sarBussionessStandEOPage = new SarBussionessStandEOPage();
-        sarBussionessStandEOPage.setIdlist(ids.split(","));
-        ResponseMessage<SarBussionessStand> result = sarBussionessStandEOService.deleteSarBussionessStand(sarBussionessStandEOPage);
-        logger.info("delete from SAR_BUSSIONESS_STAND where id = {}", ids);
-        return result;
-    }
-
-    /**
-     * 将查询出来的数据导出到EXCEL表格中
-     * @param
-     * @return
-     * @author gaoyan
-     * date 2018-09-04
-     */
-    @ApiOperation(value = "|SarBussionessStandEO|导出excel")
-    @GetMapping(value = "/exportSarBussionessStand")
-    public void exportSarBussionessStand(String exportContent, String exportType, String exportName,String userId, HttpServletResponse response, HttpServletRequest request)throws Exception {
-        OutputStream os = null;
-        Workbook workbook = null;
-        try {
-            if(StringUtils.isEmpty(exportName)||exportName.equals("null")){
-                exportName="企业标准库";
-            }
-            response.setHeader("Content-Disposition",
-                    "attachment; filename=" + ReadExcel.encodeFileName(exportName+".xlsx",request));
-            response.setContentType("application/force-download");
-            //导出数据
-            List<SarBussionessStand> datas =  sarBussionessStandEOService.getSarBussionessStand(exportType,exportContent,userId);
-            workbook = BussStandExportUtil.exportDatas(datas);
-            os = response.getOutputStream();
-            workbook.write(os);
-            os.flush();
-        } catch (IOException e) {
-            logger.error(e.getMessage(), e);
-            throw new AdcDaBaseException("下载文件失败，请重试");
-        } finally {
-            IOUtils.closeQuietly(os);
-            if (workbook != null) {
-                workbook.close();
-            }
-        }
-    }
-
    @ApiOperation(value = "|SarBussionessStandEO|企业标准修改")
    @PostMapping(value = "/updateSarBussionessStand")
    //401问题2021-03-31暂时注释掉 liuhuiwen
@@ -95,7 +95,5 @@ public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {

    int updateByPrimaryKeySelectiveTimeNotNull(SarBussionessStand sarBussionessStandEO);

-    int updateByPrimaryKeySelective(SarBussionessStand sarBussionessStandEO);
-

 }
@@ -1,6 +1,5 @@
 package com.adc.da.slrs.sarBussionessStand.service;

-import com.adc.da.http.ResponseMessage;
 import com.adc.da.search.entity.SarBussionessStandEO;
 import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
@@ -18,10 +17,6 @@ import java.util.List;
 */
 public interface ISarBussionessStandService extends IService<SarBussionessStand> {

-    ResponseMessage<SarBussionessStand> deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception;
-
-    List<SarBussionessStand> getSarBussionessStand(String exportType, String exportContent,String userId) throws Exception;
-
    SarBussionessStand updateSarBussionessStand(SarBussionessStand sarBussionessStandEO) throws Exception;

    List<SarBussionessStand> selectStandardsByStandNumber(String replaceStandNum);
@@ -6,22 +6,16 @@ import com.adc.da.common.ConvertMqEO;
 import com.adc.da.common.SarTypeEnum;
 import com.adc.da.common.SelectionTypeEnum;
 import com.adc.da.common.UseModuleEnum;
-import com.adc.da.http.ResponseMessage;
-import com.adc.da.http.Result;
 import com.adc.da.mq.CreateMQService;
 import com.adc.da.mq.CreateStandMQService;
-import com.adc.da.person.dao.PersonCollectEODao;
 import com.adc.da.person.entity.TsPersonCollect;
 import com.adc.da.person.page.PersonCollectEOPage;
 import com.adc.da.person.service.IPersonCollectEOService;
-import com.adc.da.search.entity.StandLawsEO;
-import com.adc.da.search.service.StandLawsSearchService;
 import com.adc.da.slrs.otConvertMq.dao.OtConvertMqDao;
 import com.adc.da.slrs.otConvertMq.entity.OtConvertMq;
 import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao;
 import com.adc.da.slrs.sarBussStandFile.dao.SarBussStandFileDao;
 import com.adc.da.slrs.sarBussStandFile.entity.SarBussStandFile;
-import com.adc.da.slrs.sarBussStandItems.dao.SarBussStandItemsDao;
 import com.adc.da.slrs.sarBussStandMenu.dao.SarBussStandMenuDao;
 import com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu;
 import com.adc.da.slrs.sarBussStandVal.dao.SarBussStandValDao;
@@ -33,7 +27,6 @@ import com.adc.da.slrs.sarResource.entity.TsResource;
 import com.adc.da.slrs.sarResource.service.ITsResourceService;
 import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao;
 import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao;
-import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO;
 import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
 import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService;
 import com.adc.da.slrs.sarUser.service.ITsUserService;
@@ -45,7 +38,6 @@ import com.adc.da.sys.util.LoginUserUtil;
 import com.adc.da.util.UUIDUtils;
 import com.adc.da.utils.util.FieldConvertUtil;
 import com.adc.da.utils.util.InitStandAttrUtil;
-import com.adc.da.utils.util.SarAdvanceSearchUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import net.sf.json.JSONObject;
@@ -128,12 +120,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
    @Autowired
    private ISarUpdLogService sarUpdLogEOService;

-    @Autowired
-    private ITsResourceService sarMenuEOService;
-
-    @Autowired
-    private PersonCollectEODao personCollectEODao;
-
    @Autowired
    private SarBussStandAttrInfoDao sarBussStandAttrInfoEODao;