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

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

@@ -0,0 +1,74 @@
package com.yihu.jw.entity.iot.company;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
 * @author HZY
 * @vsrsion 1.0
 * Created at 2020/5/12
 */
@Entity
@Table(name = "iot_company_user")
public class IotCompanyUserDO extends UuidIdentityEntityWithOperator implements Serializable {
    @Column(name = "account")
    private String account;//账户
    @Column(name = "company_name")
    private String companyName;//公司名称
    @Column(name = "company_id")
    private String companyId;//企业id
    @Column(name = "del")
    private String del;//是否删除：1：删除 0：不删除',
    @Column(name = "company_status")
    private String companyStatus;//企业状态：0:待审核 1：通过 2：拒绝 3：未入驻',
    public String getAccount() {
        return account;
    }
    public void setAccount(String account) {
        this.account = account;
    }
    public String getCompanyName() {
        return companyName;
    }
    public void setCompanyName(String companyName) {
        this.companyName = companyName;
    }
    public String getCompanyId() {
        return companyId;
    }
    public void setCompanyId(String companyId) {
        this.companyId = companyId;
    }
    public String getDel() {
        return del;
    }
    public void setDel(String del) {
        this.del = del;
    }
    public String getCompanyStatus() {
        return companyStatus;
    }
    public void setCompanyStatus(String companyStatus) {
        this.companyStatus = companyStatus;
    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/iot/IotRequestMapping.java

@@ -81,6 +81,8 @@ public class IotRequestMapping {
        public static final String findAll = "findAll";
        public static final String enterType = "enterType";
        public static final String conditionQueryPage = "conditionQueryPage";
        public static final String saveUser = "saveUser";
        public static final String findUserCompanyStatus = "findUserCompanyStatus";
        public static final String findCompanyCertPage = "findCompanyCertPage";
        public static final String findCompanyCertById = "findCompanyCertById";
@@ -270,6 +272,7 @@ public class IotRequestMapping {
        public static final String updOrder = "updOrder";
        public static final String createOrder = "createOrder";
        public static final String findAllOrderNo = "findAllOrderNo";
        public static final String findAllOrderBySupplierName = "findAllOrderBySupplierName";
        public static final String findPurcharsePage = "findPurcharsePage";
        public static final String findPurcharseById = "findPurcharseById";
@@ -368,6 +371,7 @@ public class IotRequestMapping {
        public static final String findInterfaceById ="findInterfaceById";
        public static final String findAll ="findAll";
        public static final String findAllLog ="findAllLog";
        public static final String findInterfaceLog ="findInterfaceLog";
        public static final String conditionQueryPage ="conditionQueryPage";
        public static final String delete ="delete";
        public static final String dataConsumption ="dataConsumption";

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/iot/platform/IotInterfaceLogVO.java

@@ -1,5 +1,6 @@
package com.yihu.jw.restmodel.iot.platform;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.yihu.jw.restmodel.iot.common.BaseVO;
import io.swagger.annotations.ApiModel;
@@ -31,6 +32,7 @@ public class IotInterfaceLogVO extends BaseVO implements Serializable {
    @ApiModelProperty("调用状态 1：成功   0：失败")
    private int  state;//调用状态 1：成功   0：失败
    @ApiModelProperty("调用时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    private Date time;//调用时间
    @ApiModelProperty("应用名称")
    private String  appName;//应用名称

svr/svr-iot/src/main/java/com/yihu/iot/controller/company/IotCompanyController.java

@@ -2,8 +2,11 @@ package com.yihu.iot.controller.company;
import com.yihu.iot.service.company.IotCompanyCertificateService;
import com.yihu.iot.service.company.IotCompanyService;
import com.yihu.iot.service.company.IotCompanyUserService;
import com.yihu.iot.service.useragent.UserAgent;
import com.yihu.jw.entity.iot.company.IotCompanyCertificateDO;
import com.yihu.jw.entity.iot.company.IotCompanyDO;
import com.yihu.jw.entity.iot.company.IotCompanyUserDO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.restmodel.iot.company.IotCompanyCertificateVO;
@@ -38,6 +41,12 @@ public class IotCompanyController extends EnvelopRestEndpoint {
    @Autowired
    private IotCompanyCertificateService iotCompanyCertificateService;
    @Autowired
    private IotCompanyUserService iotCompanyUserService;
    @Autowired
    private UserAgent userAgent;
    @GetMapping(value = IotRequestMapping.Company.findCompanyPage)
    @ApiOperation(value = "分页查找企业", notes = "分页查找企业")
    public MixEnvelop<IotCompanyVO, IotCompanyVO> findCompanyPage(@ApiParam(name = "accountType", value = "注册类型", defaultValue = "")
@@ -334,5 +343,31 @@ public class IotCompanyController extends EnvelopRestEndpoint {
    }
    @GetMapping(value = IotRequestMapping.Company.saveUser)
    @ApiOperation(value = "保存用户信息", notes = "保存用户信息")
    public MixEnvelop<IotCompanyUserDO,IotCompanyUserDO>saveUser(){
        try{
            return  iotCompanyUserService.saveUser();
        }catch (Exception e){
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
        }
    }
    @GetMapping(value = IotRequestMapping.Company.findUserCompanyStatus)
    @ApiOperation(value = "获取用户企业状态", notes = "获取用户企业状态")
    public MixEnvelop<IotCompanyUserDO,IotCompanyUserDO>findUserCompanyStatus(){
        try{
            return  iotCompanyUserService.findUserCompanyStatus();
        }catch (Exception e){
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
        }
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/controller/device/IotDeviceOrderController.java

@@ -231,4 +231,28 @@ public class IotDeviceOrderController extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = IotRequestMapping.DeviceOrder.findAllOrderBySupplierName)
    @ApiOperation(value = "根据供应商名称查询所有订单", notes = "根据供应商名称查询所有订单")
    public MixEnvelop<IotDeviceOrderVO, IotDeviceOrderVO> findAllOrderBySupplierName( @ApiParam(name = "page", value = "第几页", defaultValue = "")
                                                                                  @RequestParam(value = "page", required = false) Integer page,
                                                                                          @ApiParam(name = "size", value = "每页记录数", defaultValue = "")
                                                                                  @RequestParam(value = "size", required = false) Integer size,
                                                                                          @ApiParam(name = "supplierName", value = "supplierName")
                                                                                  @RequestParam(value = "supplierName", required = true) String supplierName
    ) {
        try {
            if(page == null|| page < 0){
                page = 1;
            }
            if(size == null){
                size = 10;
            }
            return iotDeviceOrderService.findAllOrderBySupplierName(page, size,supplierName);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
        }
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/controller/device/IotDeviceQualityController.java

@@ -140,7 +140,7 @@ public class IotDeviceQualityController extends EnvelopRestEndpoint {
                                                                   @ApiParam(name = "summary", value = "质检总结")
                                            @RequestParam(value = "summary", required = true) String summary,
                                                                   @ApiParam(name = "imgs", value = "质检图像")
                                            @RequestBody List<String> imgs ) {
                                            @RequestParam(value = "imgs",required = false,defaultValue = "") List<String> imgs ) {
        try {
            iotDeviceQualityInspectionPlanService.completePlan(id,actualTime,summary,imgs);
            return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find);

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

@@ -0,0 +1,23 @@
package com.yihu.iot.dao.company;
import com.yihu.jw.entity.iot.company.IotCompanyTypeDO;
import com.yihu.jw.entity.iot.company.IotCompanyUserDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * @author HZY
 * @vsrsion 1.0
 * Created at 2020/5/12
 */
public interface IotCompanyUserDao extends PagingAndSortingRepository<IotCompanyUserDO, String>,
        JpaSpecificationExecutor<IotCompanyUserDO> {
    @Query("FROM IotCompanyUserDO w WHERE w.account=?1 and w.del=0")
    IotCompanyUserDO findByAccount(String s);
    @Query("FROM IotCompanyUserDO w WHERE w.companyId=?1 and w.del=0")
    IotCompanyUserDO findByCompanyId(String id);
}

svr/svr-iot/src/main/java/com/yihu/iot/dao/device/IotDeviceOrderDao.java

@@ -19,4 +19,7 @@ public interface IotDeviceOrderDao extends PagingAndSortingRepository<IotDeviceO
    List<IotDeviceOrderDO> findByYmd(String ymd);
    IotDeviceOrderDO findByOrderNoAndDel(String orderNo, Integer del);
    @Query("from IotDeviceOrderDO w where w.supplierName =?1 and w.del=1")
    List<IotDeviceOrderDO> findAllBySupplierName(String supplierName);
}

svr/svr-iot/src/main/java/com/yihu/iot/dao/platform/IotInterfaceLogDao.java

@@ -3,12 +3,18 @@ package com.yihu.iot.dao.platform;
import com.yihu.jw.entity.iot.platform.IotInterfaceLogDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * @author HZY
 * @vsrsion 1.0
 * Created at 2020/4/28
 */
public interface IotInterfaceLogDao extends PagingAndSortingRepository<IotInterfaceLogDO,String>, JpaSpecificationExecutor<IotInterfaceLogDO> {
    @Query("from IotInterfaceLogDO w where w.interfaceName=?1")
    List<IotInterfaceLogDO>  findAllByInterfaceName(String interfaceName);
}

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

@@ -1,14 +1,8 @@
package com.yihu.iot.service.company;
import com.yihu.iot.dao.company.IotCompanyAppDao;
import com.yihu.iot.dao.company.IotCompanyCertificateChangeRecordDao;
import com.yihu.iot.dao.company.IotCompanyDao;
import com.yihu.iot.dao.company.IotCompanyTypeDao;
import com.yihu.iot.dao.company.*;
import com.yihu.iot.service.useragent.UserAgent;
import com.yihu.jw.entity.iot.company.IotCompanyAppDO;
import com.yihu.jw.entity.iot.company.IotCompanyCertificateChangeRecordDO;
import com.yihu.jw.entity.iot.company.IotCompanyDO;
import com.yihu.jw.entity.iot.company.IotCompanyTypeDO;
import com.yihu.jw.entity.iot.company.*;
import com.yihu.jw.restmodel.iot.company.IotCompanyAppVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.iot.company.IotCompanyTypeVO;
@@ -46,6 +40,8 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
    private IotCompanyAppDao iotCompanyAppDao;
    @Autowired
    private UserAgent userAgent;
    @Autowired
    private IotCompanyUserDao iotCompanyUserDao;
    /**
@@ -372,6 +368,11 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
            iotCompanyAppDao.save(iotCompanyAppDO);
        }
        IotCompanyUserDO userDO = iotCompanyUserDao.findByAccount(userAgent.getUNAME());
        userDO.setCompanyName(iotCompany.getName());
        userDO.setCompanyId(iotCompany.getId());
        userDO.setCompanyStatus(iotCompany.getStatus());
        iotCompanyUserDao.save(userDO);
        return MixEnvelop.getSuccess(IotRequestMapping.Company.message_success_create,iotCompany);
    }
@@ -604,6 +605,11 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
        companyDO.setAuditTime(DateUtil.getNowDate());
        companyDO.setAuditName(uname);
        iotCompanyDao.save(companyDO);
        IotCompanyUserDO userDO = iotCompanyUserDao.findByCompanyId(id);
        userDO.setCompanyStatus(companyDO.getStatus());
        iotCompanyUserDao.save(userDO);
        return MixEnvelop.getSuccess("审核操作成功");
    }
@@ -627,6 +633,11 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
        companyDO.setAuditMessage(msg);
        companyDO.setAuditName(uname);
        iotCompanyDao.save(companyDO);
        IotCompanyUserDO userDO = iotCompanyUserDao.findByCompanyId(id);
        userDO.setCompanyStatus(companyDO.getStatus());
        iotCompanyUserDao.save(userDO);
        return MixEnvelop.getSuccess("审核操作成功");
    }

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

@@ -0,0 +1,66 @@
package com.yihu.iot.service.company;
import com.alibaba.fastjson.JSONObject;
import com.yihu.iot.dao.company.IotCompanyDao;
import com.yihu.iot.dao.company.IotCompanyUserDao;
import com.yihu.iot.service.useragent.UserAgent;
import com.yihu.jw.entity.iot.company.IotCompanyDO;
import com.yihu.jw.entity.iot.company.IotCompanyUserDO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.iot.IotRequestMapping;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
 * @author HZY
 * @vsrsion 1.0
 * Created at 2020/5/13
 */
@Service
@Transactional(rollbackFor = Exception.class)
public class IotCompanyUserService extends BaseJpaService<IotCompanyUserDO, IotCompanyUserDao> {
    @Autowired
    private IotCompanyUserDao iotCompanyUserDao;
    @Autowired
    private UserAgent userAgent;
    /**
     * 保存用户信息
     */
    public MixEnvelop<IotCompanyUserDO,IotCompanyUserDO> saveUser() {
        //查找用户是否存在
        IotCompanyUserDO userDO = iotCompanyUserDao.findByAccount(userAgent.getUNAME());
        if (userDO!=null){
            return MixEnvelop.getError("用户已注册",-1);
        }
        IotCompanyUserDO companyUserDO = new IotCompanyUserDO();
        companyUserDO.setAccount(userAgent.getUNAME());
        companyUserDO.setCompanyStatus("3");
        companyUserDO.setDel("0");
        iotCompanyUserDao.save(companyUserDO);
        return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_create);
    }
    /**
     * 查找公司用户的企业状态
     * @return
     */
    public MixEnvelop<IotCompanyUserDO, IotCompanyUserDO> findUserCompanyStatus() {
        IotCompanyUserDO userDO = iotCompanyUserDao.findByAccount(userAgent.getUNAME());
        return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find,userDO.getCompanyStatus());
    }
    public static void main(String[] args) {
        String jsonString = JSONObject.toJSONString("15578008051");
        System.out.println(jsonString);
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/service/device/IotDeviceOrderService.java

@@ -443,4 +443,24 @@ public class IotDeviceOrderService extends BaseJpaService<IotDeviceOrderDO,IotDe
        });
        return list;
    }
    /**
     * 根据供应商名称查询所有订单
     * @return
     */
    public MixEnvelop<IotDeviceOrderVO, IotDeviceOrderVO>  findAllOrderBySupplierName(Integer page, Integer size,String supplierName) {
        List<IotDeviceOrderDO> listDO = iotDeviceOrderDao.findAllBySupplierName(supplierName);
        //DO转VO
        List<IotDeviceOrderVO> iotDeviceOrderVOList = new ArrayList<>();
        convertToModelVOs(listDO,iotDeviceOrderVOList);
        iotDeviceOrderVOList.forEach(one->{
            findType(one);
        });
        long count=listDO.size();
        return MixEnvelop.getSuccessListWithPage(IotRequestMapping.Common.message_success_find_functions,iotDeviceOrderVOList, page, size,count);
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/service/device/IotDeviceQualityInspectionPlanService.java

@@ -130,8 +130,8 @@ public class IotDeviceQualityInspectionPlanService extends BaseJpaService<IotDev
            planDO.setActualTime(DateUtil.strToDate(time));
            planDO.setSummary(summary);
            //设置质检小结与质检图像
            String imgJson = JSONObject.toJSONString(imgs);
            planDO.setImg(imgJson);
            planDO.setImg(imgs.toString());
            iotDeviceQualityInspectionPlanDao.save(planDO);

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

@@ -11,6 +11,7 @@ import com.yihu.jw.entity.iot.workType.IotWorkTypeDO;
import com.yihu.jw.restmodel.iot.platform.IotInterfaceLogVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.iot.IotRequestMapping;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
@@ -24,6 +25,7 @@ import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.sql.Time;
import java.text.DecimalFormat;
import java.text.ParseException;
import java.util.*;
@@ -54,7 +56,7 @@ public class IotInterfaceLogService extends BaseJpaService<IotInterfaceLogDO, Io
    /**
     * 分页查询日志信息
     * 分页查询所有接口日志信息
     * @param page
     * @param size
     * @return
@@ -62,10 +64,8 @@ public class IotInterfaceLogService extends BaseJpaService<IotInterfaceLogDO, Io
     */
    public MixEnvelop<IotInterfaceLogVO,IotInterfaceLogVO> findAll(Integer page, Integer size) throws ParseException {
        String sql = "select * from iot_interface_log where 1=1;";
        String sorts = "-updateTime";//按更新时间降序
        String sql = "SELECT * FROM (select * from iot_interface_log c where 1=1  ORDER BY c.time desc) b GROUP BY b.interface_name;";
//        List<IotInterfaceLogDO> list = search(null, filters, sorts, page, size);
        List<IotInterfaceLogDO> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper(IotInterfaceLogDO.class));
@@ -83,6 +83,34 @@ public class IotInterfaceLogService extends BaseJpaService<IotInterfaceLogDO, Io
        return MixEnvelop.getSuccessListWithPage(IotRequestMapping.Platform.message_success_find,resultList,page, size,count);
    }
    /**
     * 根据接口名称分页查询接口日志信息
     * @param page
     * @param size
     * @param interfaceName
     * @return
     */
    public MixEnvelop<IotInterfaceLogVO, IotInterfaceLogVO> findInterfaceLog(Integer page, Integer size, String interfaceName) {
        List<IotInterfaceLogDO> list = iotInterfaceLogDao.findAllByInterfaceName(interfaceName);
        ArrayList<IotInterfaceLogVO> resultList = new ArrayList<>();
        list.forEach(one->{
            IotInterfaceLogVO target = new IotInterfaceLogVO();
            BeanUtils.copyProperties(one,target);
            resultList.add(target);
        });
        long count =list.size();
        return MixEnvelop.getSuccessListWithPage(IotRequestMapping.Platform.message_success_find,resultList,page, size,count);
    }
    /**
     * 数据消费
     * @param page
@@ -169,9 +197,8 @@ public class IotInterfaceLogService extends BaseJpaService<IotInterfaceLogDO, Io
     * @param interfaceName 接口名称
     * @param method 方法名
     * @param workTypeId 业务类型
     * @param time 调用时间
     */
    public void saveLog(String appId, String params, String response, HttpServletRequest request,Integer state,String  interfaceName,String method,String workTypeId,Date time){
    public void saveLog(String appId, String params, String response, HttpServletRequest request,Integer state,String  interfaceName,String method,String workTypeId){
        IotInterfaceLogDO interfaceLogDO = new IotInterfaceLogDO();
        //设置应用与公司
@@ -210,7 +237,7 @@ public class IotInterfaceLogService extends BaseJpaService<IotInterfaceLogDO, Io
        interfaceLogDO.setState(state);
        interfaceLogDO.setInterfaceName(interfaceName);
        interfaceLogDO.setMethod(method);
        interfaceLogDO.setTime(time);
        interfaceLogDO.setTime(DateUtil.getNowDate());
        iotInterfaceLogDao.save(interfaceLogDO);
    }