合并dev

dev-decommissioning/src/main/java/com/tykj/dev/device/decommissioning/service/impl/DeviceDecommissioningDetailServiceImpl.java

@@ -281,7 +281,6 @@ public class DeviceDecommissioningDetailServiceImpl implements DeviceDecommissio
             deviceDecommissioningDetail.setReplyFileList(FilesUtil.stringFileToList(deviceDecommissioningDetail.getReplyFiles()));
             deviceDecommissioningDetail.setApplyFileList(FilesUtil.stringFileToList(deviceDecommissioningDetail.getApplyFiles()));
             deviceDecommissioningDetail.setFileMd5(FileMD5Util.fileRetToMd5(deviceDecommissioningDetail.getReplyFileList()));
-            deviceDecommissioningDetail.setScriptJson(null);
             return deviceDecommissioningDetail;
         }else {
             log.info("[退役] 详情查看错误，id没有找到{}",decommissioningId);

dev-matching/src/main/java/com/tykj/dev/device/matching/controller/ExternalUnitEquipController.java

+package com.tykj.dev.device.matching.controller;
+
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
+import com.tykj.dev.config.swagger.AutoDocument;
+import com.tykj.dev.device.library.subject.vo.DevNameVO;
+import com.tykj.dev.device.matching.service.ExternalUnitEquipService;
+import com.tykj.dev.device.matching.subject.domin.ExternalUnitEquip;
+import com.tykj.dev.device.matching.subject.vo.ExternalSelectVo;
+import com.tykj.dev.device.matching.subject.vo.ExternalUpdataVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.List;
+@RestController
+@RequestMapping(value = "/externalUnit")
+@AutoDocument
+@Api(tags = "外单位设备", description = "外单位设备")
+@Validated
+public class ExternalUnitEquipController {
+
+
+
+    @Autowired
+    private ExternalUnitEquipService externalUnitEquipService;
+
+    @ApiOperation(value = "登记信息", notes = "登记信息")
+    @PostMapping("/register")
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseEntity exportExcel(@RequestBody List<ExternalUnitEquip> externalUnitEquips) {
+        externalUnitEquipService.register(externalUnitEquips);
+        return ResponseEntity.ok("成功");
+    }
+
+    @ApiOperation(value = "删除外单位zb数据", notes = "登记信息")
+    @PostMapping("/delete")
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseEntity delete(@RequestBody ExternalUpdataVo externalUpdataVo) {
+
+        externalUnitEquipService.updateState(externalUpdataVo);
+        return ResponseEntity.ok("成功");
+    }
+
+
+    @ApiOperation(value = "根据单位名称查询", notes = "登记信息")
+    @PostMapping("/queryUnitName")
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseEntity queryUnitName(@RequestBody DevNameVO devNameVO) {
+
+        return ResponseEntity.ok(externalUnitEquipService.queryUnitName(devNameVO.getName()));
+    }
+
+
+    @ApiOperation(value = "根据id查询详情", notes = "登记信息")
+    @GetMapping("/queryById/{id}")
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseEntity queryById(@PathVariable int id) {
+
+        return ResponseEntity.ok(externalUnitEquipService.queryById(id));
+    }
+
+
+
+    @ApiOperation(value = "条件查询相关数据列表", notes = "登记信息")
+    @PostMapping("/queryPage")
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseEntity queryPage(@RequestBody ExternalSelectVo externalSelectVo) {
+
+        return ResponseEntity.ok(externalUnitEquipService.queryPage(externalSelectVo));
+    }
+
+
+    @PostMapping("/importExcel1")
+    @ApiOperation(value = "原本exl解析")
+    public ResponseEntity importExcel1(@RequestParam("file") MultipartFile file) {
+
+        try {
+            byte[] byteArr = new byte[0];
+            byteArr = file.getBytes();
+
+            InputStream inputStream = new ByteArrayInputStream(byteArr);
+            //解析excel
+            ImportParams importParams = new ImportParams();
+            importParams.setHeadRows(1);
+            importParams.setTitleRows(0);
+            List<ExternalUnitEquip> excelRegs = ExcelImportUtil.importExcel(inputStream, ExternalUnitEquip.class, importParams);
+            excelRegs.forEach(
+                    externalUnitEquip -> {
+                        if (!toFlag(externalUnitEquip.getUnitName())){
+                            externalUnitEquip.setUnitName(null);
+                        }
+                    }
+            );
+            return ResponseEntity.ok(excelRegs);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return ResponseEntity.status(501).body("解析exl失败,请查看模版");
+    }
+
+
+    public boolean toFlag(String name){
+        switch (name){
+            case  "715所":
+
+            case  "省检察院":
+
+            case  "省政府办公厅":
+
+            case  "省用通信局":
+
+            case  "宁波市专用通信局":
+
+                return true;
+            default:
+                return false;
+
+        }
+
+    }
+
+}

dev-matching/src/main/java/com/tykj/dev/device/matching/repository/ExternalUnitEquipDao.java

+package com.tykj.dev.device.matching.repository;
+
+import com.tykj.dev.device.matching.subject.domin.ExternalUnitEquip;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import javax.transaction.Transactional;
+import java.util.List;
+
+public interface ExternalUnitEquipDao  extends JpaRepository<ExternalUnitEquip, Integer>, JpaSpecificationExecutor<ExternalUnitEquip> {
+
+    @Transactional
+    @Modifying
+    @Query(value = "update ExternalUnitEquip d set d.state = ?2 ,d.fileJson =?3,d.deactivateDes = ?4  where d.id in ?1")
+    int updateStateAndJson(List<Integer> ids,Integer state,String json,String des);
+
+
+    List<ExternalUnitEquip> findAllByUnitName(String name);
+
+}

dev-matching/src/main/java/com/tykj/dev/device/matching/service/ExternalUnitEquipService.java

+package com.tykj.dev.device.matching.service;
+
+import com.tykj.dev.device.file.entity.FileRet;
+import com.tykj.dev.device.matching.subject.domin.ExternalUnitEquip;
+import com.tykj.dev.device.matching.subject.vo.ExternalSelectVo;
+import com.tykj.dev.device.matching.subject.vo.ExternalUnitEquipPageVo;
+import com.tykj.dev.device.matching.subject.vo.ExternalUpdataVo;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
+
+public interface ExternalUnitEquipService {
+
+    /**
+     * 登记装备
+     */
+    void register(List<ExternalUnitEquip> externalUnitEquips);
+
+    /**
+     * 删除装备
+     */
+    void updateState(ExternalUpdataVo externalUpdataVo);
+    /**
+     * 根据单位查询数据
+     */
+    List<ExternalUnitEquip> queryUnitName(String unitName);
+
+
+    ExternalUnitEquipPageVo queryPage(ExternalSelectVo externalSelectVo);
+
+    ExternalUnitEquip queryById(Integer id);
+
+
+
+}

dev-matching/src/main/java/com/tykj/dev/device/matching/service/impl/ExternalUnitEquipServiceImpl.java

+package com.tykj.dev.device.matching.service.impl;
+
+import com.github.wenhao.jpa.PredicateBuilder;
+import com.github.wenhao.jpa.Specifications;
+import com.tykj.dev.device.file.entity.FileRet;
+import com.tykj.dev.device.matching.repository.ExternalUnitEquipDao;
+import com.tykj.dev.device.matching.service.ExternalUnitEquipService;
+import com.tykj.dev.device.matching.subject.domin.ExternalUnitEquip;
+import com.tykj.dev.device.matching.subject.vo.ExternalSelectVo;
+import com.tykj.dev.device.matching.subject.vo.ExternalUnitEquipPageVo;
+import com.tykj.dev.device.matching.subject.vo.ExternalUpdataVo;
+import com.tykj.dev.misc.utils.JacksonUtil;
+import com.tykj.dev.misc.utils.PageUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+public class ExternalUnitEquipServiceImpl implements ExternalUnitEquipService {
+
+    @Autowired
+    ExternalUnitEquipDao externalUnitEquipDao;
+
+    @Override
+    public void register(List<ExternalUnitEquip> externalUnitEquips) {
+        externalUnitEquipDao.saveAll(externalUnitEquips);
+    }
+
+    @Override
+    public void updateState(ExternalUpdataVo externalUpdataVo) {
+        externalUnitEquipDao.updateStateAndJson(externalUpdataVo.getIds(),1, JacksonUtil.toJSon(externalUpdataVo.getFileRets()),externalUpdataVo.getDes());
+
+    }
+
+    @Override
+    public List<ExternalUnitEquip> queryUnitName(String unitName) {
+        return externalUnitEquipDao.findAllByUnitName(unitName);
+    }
+
+    @Override
+    public ExternalUnitEquipPageVo queryPage(ExternalSelectVo externalSelectVo) {
+        Map<String,List<String>> map=new HashMap<>();
+        List<ExternalUnitEquip> all = externalUnitEquipDao.findAll(getPredicateBuilder(externalSelectVo).build());
+
+        map.put("model",all.stream().map(ExternalUnitEquip::getModel).distinct().collect(Collectors.toList()));
+        map.put("name",all.stream().map(ExternalUnitEquip::getName).distinct().collect(Collectors.toList()));
+        map.put("form",all.stream().map(ExternalUnitEquip::getForm).distinct().collect(Collectors.toList()));
+        map.put("unitName",all.stream().map(ExternalUnitEquip::getUnitName).distinct().collect(Collectors.toList()));
+
+        Page<ExternalUnitEquip> perPage = PageUtil.getPerPage(externalSelectVo.getPage(), externalSelectVo.getSize(), all, externalSelectVo.getPageable());
+        return new ExternalUnitEquipPageVo(perPage,map);
+    }
+
+    @Override
+    public ExternalUnitEquip queryById(Integer id) {
+        return externalUnitEquipDao.findById(id).get();
+    }
+
+
+    private PredicateBuilder<ExternalUnitEquip> getPredicateBuilder(ExternalSelectVo externalSelectVo) {
+        PredicateBuilder<ExternalUnitEquip> predicateBuilder = Specifications.and();
+        if (externalSelectVo != null) {
+            if (externalSelectVo.getName() != null) {
+                predicateBuilder.eq("name",externalSelectVo.getName());
+            }
+
+            if (externalSelectVo.getModel() != null) {
+                predicateBuilder.eq("model",externalSelectVo.getModel());
+            }
+            if (externalSelectVo.getUnitName() != null) {
+                predicateBuilder.eq("unitName",externalSelectVo.getUnitName());
+            }
+            if (externalSelectVo.getNum() != null) {
+                predicateBuilder.eq("num",externalSelectVo.getNum());
+            }
+            if (externalSelectVo.getForm() != null) {
+                predicateBuilder.eq("form",externalSelectVo.getForm());
+            }
+
+            if (externalSelectVo.getState() !=null){
+                predicateBuilder.eq("state",externalSelectVo.getState());
+
+            }
+
+        }
+        return predicateBuilder;
+    }
+}

dev-matching/src/main/java/com/tykj/dev/device/matching/subject/domin/ExternalUnitEquip.java

+package com.tykj.dev.device.matching.subject.domin;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.tykj.dev.misc.base.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.Table;
+
+@Data
+@Entity
+@EntityListeners(AuditingEntityListener.class)
+@SQLDelete(sql = "update matching_device_bill set delete_tag = 1 where id = ?")
+@Where(clause = "delete_tag = 0")
+@ApiModel("外单位设备")
+@Table(name = "zb_external_unit_equip")
+public class ExternalUnitEquip extends BaseEntity {
+
+    @Excel(name = "型号")
+    @ApiModelProperty(value = "型号")
+    private String model;
+
+    @ApiModelProperty(value = "序列号")
+    @Excel(name = "序列号")
+    private String num;
+
+    //名称
+    @ApiModelProperty(value = "名称")
+    @Excel(name = "名称")
+    private String name;
+    //形态
+    @ApiModelProperty(value = "形态")
+    @Excel(name = "形态")
+    private String form;
+    //类型
+    @ApiModelProperty(value = "类型")
+    private Integer type = 0;
+    //生命状态
+    @ApiModelProperty(value = "生命状态")
+    private String lifeState ="在库";
+    //存放位置
+    @ApiModelProperty(value = "存放位置")
+    private String storageLocation ="";
+
+    @ApiModelProperty(value = "备注")
+    @Excel(name = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "所属单位")
+    @Excel(name = "所属单位")
+    private String unitName;
+
+    @Column(name = "file_json" ,columnDefinition = "TEXT")
+    private String fileJson;
+
+    @ApiModelProperty(value = "状态 0启动 1停止")
+    private Integer state = 0;
+
+    @ApiModelProperty(value = "停止说明")
+    @Column(name = "deactivate_des" ,columnDefinition = "TEXT")
+    private String deactivateDes;
+
+
+}

dev-matching/src/main/java/com/tykj/dev/device/matching/subject/vo/ExternalSelectVo.java

+package com.tykj.dev.device.matching.subject.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.tykj.dev.misc.base.CustomPage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author zjm
+ * @version 1.0.0
+ * @ClassName ReceiveVo.java
+ * @Description TODO
+ * @createTime 2022年07月19日 09:39:00
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ExternalSelectVo extends CustomPage {
+
+    @ApiModelProperty(value = "机型")
+    private String model;
+
+    @ApiModelProperty(value = "序列号")
+    private String num;
+
+    //名称
+    @ApiModelProperty(value = "名称")
+    private String name;
+    //形态
+    @ApiModelProperty(value = "形态")
+    private String form;
+
+    @ApiModelProperty(value = "单位名称")
+    private String unitName;
+
+
+    @ApiModelProperty(value = "状态 0启动 1停止")
+    private Integer state;
+
+
+}

dev-matching/src/main/java/com/tykj/dev/device/matching/subject/vo/ExternalUnitEquipPageVo.java

+package com.tykj.dev.device.matching.subject.vo;
+
+import com.tykj.dev.device.file.entity.FileRet;
+import com.tykj.dev.device.matching.subject.domin.ExternalUnitEquip;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ExternalUnitEquipPageVo {
+
+    @ApiModelProperty(value = "分页内容")
+    private Page<ExternalUnitEquip> externalUnitEquips;
+
+    @ApiModelProperty(value = "条件内容")
+    private Map<String,List<String>> map;
+}

dev-matching/src/main/java/com/tykj/dev/device/matching/subject/vo/ExternalUpdataVo.java

+package com.tykj.dev.device.matching.subject.vo;
+
+import com.tykj.dev.device.file.entity.FileRet;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ExternalUpdataVo {
+
+    @ApiModelProperty(value = "ids集合")
+    private List<Integer> ids;
+
+    @ApiModelProperty(value = "文件集合")
+    private List<FileRet> fileRets;
+
+    @ApiModelProperty(value = "备注")
+    private String des;
+}

dev-misc/src/main/java/com/tykj/dev/misc/base/BaseEntity.java

@@ -35,7 +35,7 @@ public class BaseEntity {
      */
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
-//    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
+    @Column(columnDefinition = "integer NOT NULL AUTO_INCREMENT")
     private Integer id;
 
     /**

dev-scrap/src/main/java/com/tykj/dev/device/scrap/service/impl/ScrapServiceImpl.java

@@ -260,7 +260,6 @@ public class ScrapServiceImpl implements ScrapService {
             scrap.setOutboundFiles(FilesUtil.stringFileToList(scrap.getOutboundFile()));
             scrap.setReplyFileList(FilesUtil.stringFileToList(scrap.getReplyFiles()));
             scrap.setApplyFileList(FilesUtil.stringFileToList(scrap.getApplyFiles()));
-//            scrap.setScripts(scrap.getScripts());
             scrap.setFileMd5(FileMD5Util.fileRetToMd5(scrap.getOutboundFiles()));
             return scrap;
         }else {

dev-union/src/main/resources/application-dev.properties

@@ -15,7 +15,7 @@ spring.jpa.hibernate.ddl-auto=update
 # spring boot admin
 
 #file.path=/Users/ozoz/data/
-file.path=C:/ZB/
+file.path=C:/file/
 preview.path=http://192.168.102.169:8087/file/
 spring.boot.admin.client.url=http://localhost:8769
 spring.boot.admin.client.instance.serviceBaseUrl=http://localhost:8087

dev-union/src/main/resources/application-prodM.properties

@@ -11,4 +11,4 @@ block.flag=true
 
 carrier.url = http://10.153.4.11:8088/carrier/configuration/saveConfiguration
 file.matching.excel=/data/equip/matching/excel/
-ven.http=http://10.153.4.10:8081
\ No newline at end of file
+ven.http=http://10.153.6.10:8081
\ No newline at end of file

dev-union/src/main/resources/application-prodT.properties

@@ -16,5 +16,5 @@ file.matching.excel=/data/equipTest/matching/excel/
 block.carrier.ip=http://10.153.4.11:8088/blockTest
 check.time.last=/opt/zb/check
 
-ven.http=http://10.153.4.10:8081
+ven.http=http://10.153.6.10:8081
 

dev-union/src/main/resources/application-test.properties

@@ -24,4 +24,5 @@ file.matching.excel=/data/equip/excel/
 block.carrier.ip=http://10.153.4.80:8088/block
 
 check.time.last=/opt/zb/check
+
 ven.http=http://10.153.4.80:8081

dev-user/src/main/java/com/tykj/dev/device/user/config/SecurityConfig.java

@@ -114,7 +114,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/packageVersion/getVersion","/equip/packageVersion/getVersion").permitAll()//
                 .antMatchers("/equip/file/llq/**").permitAll()
                 .antMatchers("/code/**","/equip/code/**").permitAll()
-                .antMatchers("/upload","/device/queryByOwnUnit","/allot/dataToZt").permitAll()
+                .antMatchers("/upload","/device/queryByOwnUnit","/allot/dataToZt","/externalUnit/queryUnitName","/device/deviceLibraryChangeTime").permitAll()
                 .antMatchers(HttpMethod.OPTIONS, "/**").permitAll()
 //                .withObjectPostProcessor(new ObjectPostProcessor<FilterSecurityInterceptor>() {
 //                    @Override

dev-user/src/main/java/com/tykj/dev/device/user/util/AuthenticationUtils.java

@@ -55,6 +55,7 @@ public class AuthenticationUtils {
             Object userObject = authentication.getPrincipal();
             if (ANONYMOUS_USER_STRING.equals(userObject)) {
 //                log.info("当前无登录用户");
+                return null;
             }
 
             if (userObject instanceof SecurityUser) {