设备导入

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysDeviceController.java

@@ -195,11 +195,12 @@ public class SysDeviceController extends BaseController {
                     SysDevice sysDevice = new SysDevice();
                     BeanUtils.copyProperties(d, sysDevice);
                     sysDevice.setDelFlag("0");
-                    SysOrg sysOrg = sysOrgService.selectByShortName(d.getOrgName());
+                    SysOrg sysOrg = sysOrgService.selectByOrgName(d.getOrgName());
                     if (null == d.getDeviceName() || null == d.getOrgName() || null == d.getAssetType() || null == d.getDeviceType()) {
                         throw new RuntimeException("请完善数据");
                     }
                     if (null != sysOrg) {
+                        sysDevice.setOrgName(sysOrg.getShortName());
                         SysDevice sysDevice1 = sysDeviceService.selectByHostNameAndOrgId(d.getHostName(), sysOrg.getId());
                         sysDevice.setOrgId(sysOrg.getId());
                         //查询资产类别

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysOrgMapper.java

@@ -23,7 +23,7 @@ import java.util.Map;
  */
 @Component
 public interface SysOrgMapper extends BaseMapper<SysOrg> {
-    List<SysOrg> selectByShortName(String name);
+    List<SysOrg> selectByOrgName(String name);
 
     /**
      * 查询【请填写功能名称】

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysOrgService.java

@@ -164,7 +164,7 @@ public interface ISysOrgService extends IService<SysOrg> {
 
     List<SysOrg> selectChildrenFromDb(Long id);
 
-    SysOrg selectByShortName(String shortName);
+    SysOrg selectByOrgName(String shortName);
 
     String selectOrgNameByPath(Long orgId);
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysOrgServiceImpl.java

@@ -865,8 +865,8 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     }
 
     @Override
-    public SysOrg selectByShortName(String shortName) {
-        List<SysOrg> sysOrgs = baseMapper.selectByShortName(shortName);
+    public SysOrg selectByOrgName(String orgName) {
+        List<SysOrg> sysOrgs = baseMapper.selectByOrgName(orgName);
         if (!CollectionUtil.isEmpty(sysOrgs)) {
             if (sysOrgs.size() > 1) {
                 throw new RuntimeException("机构名称重复，导入失败；请检查后重试");

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysOrgMapper.xml

@@ -686,8 +686,8 @@
         select c.* from sys_org c where c.type = #{orgType} and c.path like concat('%',#{path}, '%')  and deleted=0
 
     </select>
-    <select id="selectByShortName" resultType="com.xunmei.system.api.domain.SysOrg">
-            SELECT * FROM sys_org WHERE short_name=#{name}  AND deleted=0
+    <select id="selectByOrgName" resultType="com.xunmei.system.api.domain.SysOrg">
+            SELECT * FROM sys_org WHERE `name` =#{name}  AND deleted=0
     </select>
     <select id="findByOrgTypesAndParent" resultType="com.xunmei.system.api.domain.SysOrg">
         select c.* from sys_org c where c.path like concat('%',#{path}, '%')  and deleted=0