Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	svr/svr-iot/src/main/java/com/yihu/iot/controller/platform/IotInterfaceController.java

common/common-entity/src/main/java/com/yihu/jw/entity/iot/company/IotCompanyTypeDO.java

@@ -24,6 +24,9 @@ public class IotCompanyTypeDO extends UuidIdentityEntityWithOperator implements
    @Column(name = "type_name")
    private String typeName;//企业类型名称
    @Column(name = "del")
    private String del;//删除标识 1：删除 0：不删除',
    public String getSaasId() {
        return saasId;
    }
@@ -55,4 +58,12 @@ public class IotCompanyTypeDO extends UuidIdentityEntityWithOperator implements
    public void setTypeName(String typeName) {
        this.typeName = typeName;
    }
    public String getDel() {
        return del;
    }
    public void setDel(String del) {
        this.del = del;
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/dao/company/IotCompanyTypeDao.java

@@ -14,6 +14,6 @@ import java.util.List;
public interface IotCompanyTypeDao extends PagingAndSortingRepository<IotCompanyTypeDO, String>,
        JpaSpecificationExecutor<IotCompanyTypeDO> {
    @Query("select s from IotCompanyTypeDO s where s.companyId = ?1 ")
    @Query("select s from IotCompanyTypeDO s where s.companyId = ?1 and s.del=0 ")
    List<IotCompanyTypeDO> findByCompanyId(String companyId);
}

svr/svr-iot/src/main/java/com/yihu/iot/service/company/IotCompanyService.java

@@ -1,8 +1,10 @@
package com.yihu.iot.service.company;
import com.yihu.iot.dao.company.*;
import com.yihu.iot.dao.platform.IotCompanyAppInterfaceDao;
import com.yihu.iot.service.useragent.UserAgent;
import com.yihu.jw.entity.iot.company.*;
import com.yihu.jw.entity.iot.platform.IotCompanyAppInterfaceDO;
import com.yihu.jw.restmodel.iot.company.IotCompanyAppVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.iot.company.IotCompanyTypeVO;
@@ -40,7 +42,8 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
    private IotCompanyAppDao iotCompanyAppDao;
    @Autowired
    private UserAgent userAgent;
    @Autowired
    private IotCompanyAppInterfaceDao iotCompanyAppInterfaceDao;
    /**
@@ -309,6 +312,7 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
                companyType.setCompanyId(id);
                companyType.setType(one.getType());
                companyType.setTypeName(one.getTypeName());
                companyType.setDel("0");
                companyTypes.add(companyType);
            });
            iotCompanyTypeDao.save(companyTypes);
@@ -462,6 +466,42 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
        return   MixEnvelop.getError("该企业已删除，请勿重复操作");
        }
        company.setDel(0);
        //删除企业下的信息  平台信息
        if(company.getAccountType().equalsIgnoreCase("0")){
            List<IotCompanyAppDO> appDOList = iotCompanyAppDao.findByCompanyId(company.getId());
            if (appDOList!=null&&appDOList.size()>0){
                //删除应用信息
                appDOList.forEach(one->{
                    one.setDel("0");
                    //删除接口信息
                    List<IotCompanyAppInterfaceDO> interfaceDOList = iotCompanyAppInterfaceDao.findByAppId(one.getId());
                    if (interfaceDOList!=null&&interfaceDOList.size()>0){
                        interfaceDOList.forEach(tow->{
                            tow.setDel("1");
                            iotCompanyAppInterfaceDao.save(tow);
                        });
                    }
                    iotCompanyAppDao.save(one);
                });
            }
        }
        //删除产商信息
        if (company.getAccountType().equalsIgnoreCase("1")){
            List<IotCompanyTypeDO> typeDOList = iotCompanyTypeDao.findByCompanyId(company.getId());
            //删除产商类型
            if (typeDOList!=null&&typeDOList.size()>0){
                typeDOList.forEach(one->{
                    one.setDel("1");
                    iotCompanyTypeDao.save(one);
                });
            }
        }
        iotCompanyDao.save(company);
        return MixEnvelop.getSuccess(IotRequestMapping.Company.message_success_delete);
    }
@@ -475,7 +515,10 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
        if(accountType.equalsIgnoreCase("1")){
            //更新类型
            List<IotCompanyTypeDO> typeList = iotCompanyTypeDao.findByCompanyId(iotCompany.getId());
            iotCompanyTypeDao.delete(typeList);
           typeList.forEach(one->{
               one.setDel("1");
               iotCompanyTypeDao.save(one);
           });
            List<IotCompanyTypeDO> companyTypes = new ArrayList<>(10);
            iotCompany.getTypeList().forEach(one->{
@@ -484,10 +527,12 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
                companyType.setCompanyId(iotCompany.getId());
                companyType.setType(one.getType());
                companyType.setTypeName(one.getTypeName());
                companyType.setDel("0");
                companyTypes.add(companyType);
            });
            iotCompanyTypeDao.save(companyTypes);
        }
        //更新应用
        if(accountType.equalsIgnoreCase("0")){
@@ -678,7 +723,7 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
        IotCompanyDO companyDO = iotCompanyDao.findByAccount(userAgent.getUNAME());
        if (companyDO==null){
            return MixEnvelop.getError("未入驻企业",-1);
            return MixEnvelop.getSuccess("未入驻企业",-1);
        }
        return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find,companyDO.getStatus());
    }

svr/svr-iot/src/main/java/com/yihu/iot/service/platform/IotShareInterfaceService.java

@@ -124,8 +124,8 @@ public class IotShareInterfaceService extends BaseJpaService<IotShareInterfaceDO
            args.add(type);
        }
        if(StringUtils.isNotBlank(name)){
            sql.append(" and c.method_name like '%").append(name).append("%'");
            sqlCount.append(" and c.method_name like '%").append(name).append("%'");
            sql.append(" and c.interface_name like '%").append(name).append("%'");
            sqlCount.append(" and c.interface_name like '%").append(name).append("%'");
        }
        sql.append("order by c.update_time desc limit ").append((page-1)*size).append(",").append(size);