|
|
|
|
using AutoMapper;
|
|
|
|
|
using zzz.Common.Helper;
|
|
|
|
|
using zzz.Model;
|
|
|
|
|
using zzz.Model.Entity;
|
|
|
|
|
using zzz.Repository;
|
|
|
|
|
using zzz.Services;
|
|
|
|
|
using zzz.Services.Sys.TasksQzs;
|
|
|
|
|
using zzz.Services.Sys.TasksQzs.Dtos;
|
|
|
|
|
using zzz.Services.Sys.Tests;
|
|
|
|
|
using zzz.Services.Sys.Tests.Dtos;
|
|
|
|
|
using Microsoft.AspNetCore.Mvc;
|
|
|
|
|
using Newtonsoft.Json;
|
|
|
|
|
using System.Linq.Expressions;
|
|
|
|
|
using Yitter.IdGenerator;
|
|
|
|
|
using zzz.Common;
|
|
|
|
|
using zzz.Services.ReadPLC;
|
|
|
|
|
|
|
|
|
|
namespace zzz.Api.Controllers
|
|
|
|
|
{
|
|
|
|
|
//#if !DEBUG
|
|
|
|
|
// [NonController]
|
|
|
|
|
//#endif
|
|
|
|
|
/// <summary>
|
|
|
|
|
///
|
|
|
|
|
/// </summary>
|
|
|
|
|
[ApiController]
|
|
|
|
|
[Route("api/[controller]/[action]")]
|
|
|
|
|
public class TestController : BaseApiController
|
|
|
|
|
{
|
|
|
|
|
private readonly IMapper _mapper;
|
|
|
|
|
private readonly ITestServices _testServices;
|
|
|
|
|
private readonly ITasksQzServices _tasksQzServices;
|
|
|
|
|
private readonly IReadPLCDataService _readPLCDataService;
|
|
|
|
|
/// <summary>
|
|
|
|
|
///
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <param name="mapper"></param>
|
|
|
|
|
/// <param name="testServices"></param>
|
|
|
|
|
/// <param name="tasksQzServices"></param>
|
|
|
|
|
/// <param name="readPLCDataService"></param>
|
|
|
|
|
public TestController(
|
|
|
|
|
IMapper mapper,
|
|
|
|
|
ITestServices testServices,
|
|
|
|
|
ITasksQzServices tasksQzServices,
|
|
|
|
|
IReadPLCDataService readPLCDataService
|
|
|
|
|
)
|
|
|
|
|
{
|
|
|
|
|
_mapper = mapper;
|
|
|
|
|
_testServices = testServices;
|
|
|
|
|
_tasksQzServices= tasksQzServices;
|
|
|
|
|
_readPLCDataService = readPLCDataService;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 测试 增加数据 BaseService
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
[HttpPost]
|
|
|
|
|
public async Task<dynamic> TestAdd(AddOrUpdTestInput input)
|
|
|
|
|
{
|
|
|
|
|
input.Entity.Id = ConvertUtil2.ConvertType<long>(YitIdHelper.NextId());
|
|
|
|
|
|
|
|
|
|
var ret = await _testServices.AddOne<DtoEditTest, long>(input.Entity);
|
|
|
|
|
|
|
|
|
|
return Success(ret);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 测试 增加数据 接口
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
[HttpPost]
|
|
|
|
|
public async Task<dynamic> TestAddIF(AddOrUpdTestInput input)
|
|
|
|
|
{
|
|
|
|
|
input.Entity.Id = ConvertUtil2.ConvertType<long>(YitIdHelper.NextId());
|
|
|
|
|
|
|
|
|
|
var ret = await _testServices.AddTest( input);
|
|
|
|
|
|
|
|
|
|
return Success(ret);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 测试 修改数据 BaseService
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
[HttpPost]
|
|
|
|
|
public async Task<dynamic> TestUpd(AddOrUpdTestInput input)
|
|
|
|
|
{
|
|
|
|
|
var ret = await _testServices.UpdOne<DtoEditTest, long>(input.Entity);
|
|
|
|
|
|
|
|
|
|
return Success(ret);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 测试 修改部分数据 BaseService
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
[HttpPost]
|
|
|
|
|
public async Task<dynamic> TestUpd2(DtoEditTest2 input)
|
|
|
|
|
{
|
|
|
|
|
var ret = await _testServices.UpdOne<DtoEditTest2, long>(input);
|
|
|
|
|
|
|
|
|
|
return Success(ret);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 测试 修改数据 接口
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
[HttpPost]
|
|
|
|
|
public async Task<dynamic> TestUpdIF(AddOrUpdTestInput input)
|
|
|
|
|
{
|
|
|
|
|
var ret = await _testServices.UpdTest(input);
|
|
|
|
|
|
|
|
|
|
return Success(ret);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 测试 修改部分数据 接口
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
[HttpPost]
|
|
|
|
|
public async Task<dynamic> TestUpd2IF(DtoEditTest2 input)
|
|
|
|
|
{
|
|
|
|
|
var ret = await _testServices.UpdTest2(input);
|
|
|
|
|
|
|
|
|
|
return Success(ret);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 测试 软删除数据 BaseService
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
[HttpPost]
|
|
|
|
|
public async Task<dynamic> TestDelSoft(KeyInputUpd<long> input)
|
|
|
|
|
{
|
|
|
|
|
var ret = await _testServices.DelOneSoft<Test, long>(input);
|
|
|
|
|
|
|
|
|
|
return Success(ret);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 测试 软删除数据 接口
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
[HttpPost]
|
|
|
|
|
public async Task<dynamic> TestDelSoftIF(KeyInputUpd<long> input)
|
|
|
|
|
{
|
|
|
|
|
var ret = await _testServices.DelTest(input);
|
|
|
|
|
|
|
|
|
|
return Success(ret);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 测试取单条数据 BaseService
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <param name="input"></param>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
[HttpGet]
|
|
|
|
|
public async Task<dynamic> TestGet([FromQuery] KeyInput<long> input)
|
|
|
|
|
{
|
|
|
|
|
var ret = await _testServices.GetOneById<DtoEditTest,long>(input.Id);
|
|
|
|
|
|
|
|
|
|
return Success(ret);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 测试取单条数据 IF
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <param name="input"></param>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
[HttpGet]
|
|
|
|
|
public async Task<dynamic> TestGetIf([FromQuery] KeyInput<long> input)
|
|
|
|
|
{
|
|
|
|
|
var ret = await _testServices.GetTest(input);
|
|
|
|
|
|
|
|
|
|
return Success(ret);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 测试分页数据 Baseservice
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <param name="input"></param>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
[HttpGet]
|
|
|
|
|
public async Task<dynamic> TestPage([FromQuery] GetPageListTestInput input)
|
|
|
|
|
{
|
|
|
|
|
var ret = await _testServices.GetPageList<DtoViewTest>(null,input.PageIndex,input.PageSize,input.SortSql);
|
|
|
|
|
|
|
|
|
|
return Success(ret);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 测试分页数据 IF
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <param name="input"></param>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
[UseTran]
|
|
|
|
|
[HttpGet]
|
|
|
|
|
public async Task<dynamic> TestPageIF([FromQuery] GetPageListTestInput input)
|
|
|
|
|
{
|
|
|
|
|
var ret = await _testServices.GetPageListTest(input);
|
|
|
|
|
|
|
|
|
|
return Success(ret);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
///
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
[HttpGet]
|
|
|
|
|
[UseTran]
|
|
|
|
|
public string TestUseTran()
|
|
|
|
|
{
|
|
|
|
|
return "看看是否拦截到";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
///// <summary>
|
|
|
|
|
///// 测试 change
|
|
|
|
|
///// </summary>
|
|
|
|
|
///// <returns></returns>
|
|
|
|
|
//[HttpGet]
|
|
|
|
|
//public async Task<dynamic> T2()
|
|
|
|
|
//{
|
|
|
|
|
// var a = await _testServices.QueryById(1);
|
|
|
|
|
|
|
|
|
|
// //_tasksQzServices.ChangeRepository<TasksQz>();
|
|
|
|
|
|
|
|
|
|
// var b = await _tasksQzServices.QueryById(1);
|
|
|
|
|
|
|
|
|
|
// var ret = JsonConvert.SerializeObject(a) + "|||" + JsonConvert.SerializeObject(b);
|
|
|
|
|
// return ret;
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
///// <summary>
|
|
|
|
|
/////
|
|
|
|
|
///// </summary>
|
|
|
|
|
///// <returns></returns>
|
|
|
|
|
//[HttpGet]
|
|
|
|
|
//public async Task<dynamic> T3()
|
|
|
|
|
//{
|
|
|
|
|
// var testList = await _testServices.Query();
|
|
|
|
|
// var maxId = 1;
|
|
|
|
|
// if (testList.Any())
|
|
|
|
|
// {
|
|
|
|
|
// maxId = maxId + 1;
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
// await _testServices.Add(new Test()
|
|
|
|
|
// {
|
|
|
|
|
// Id = maxId,
|
|
|
|
|
// Txt1 = DateTime.Now.ToString(),
|
|
|
|
|
// Flo1 = maxId * 2.36F
|
|
|
|
|
// }); ;
|
|
|
|
|
|
|
|
|
|
// var ret = JsonConvert.SerializeObject(await _testServices.Query());
|
|
|
|
|
// return ret;
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
///// <summary>
|
|
|
|
|
/////
|
|
|
|
|
///// </summary>
|
|
|
|
|
///// <returns></returns>
|
|
|
|
|
//[HttpGet]
|
|
|
|
|
//public async Task<dynamic> TestMapper()
|
|
|
|
|
//{
|
|
|
|
|
// Expression<Func<TasksQz, bool>> where = a => a.IsDeleted != true ;
|
|
|
|
|
|
|
|
|
|
// var data = await _tasksQzServices.QueryPage(where, 1, 20, " Id desc ");
|
|
|
|
|
|
|
|
|
|
// var sssef = JsonConvert.SerializeObject(data);
|
|
|
|
|
|
|
|
|
|
// var ss = data.ConvertTo<DtoViewTaskQz>();
|
|
|
|
|
|
|
|
|
|
// return MessageModel<PageModel<DtoViewTaskQz>>.Success("",ss);
|
|
|
|
|
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 读取13线数据
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <param name="input"></param>
|
|
|
|
|
[HttpPost]
|
|
|
|
|
public async void TestRead13(EquipInput input)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
//IP 183.129.248.194
|
|
|
|
|
await _readPLCDataService.ReadDataLine13(input);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//INSERT INTO `cjyx`.`eqmt_base`(`id`, `eqmt_id`, `line_name`, `product`, `gmt_create`, `gmt_modified`, `strand_speed`) VALUES(6, 6, '15#', '卫生巾', '2022-11-11 11:34:09', NULL, 500);
|
|
|
|
|
//INSERT INTO `cjyx`.`eqmt_base`(`id`, `eqmt_id`, `line_name`, `product`, `gmt_create`, `gmt_modified`, `strand_speed`) VALUES(7, 7, '7#', '卫生巾', '2022-11-11 11:34:09', NULL, 500);
|
|
|
|
|
//INSERT INTO `cjyx`.`eqmt_base`(`id`, `eqmt_id`, `line_name`, `product`, `gmt_create`, `gmt_modified`, `strand_speed`) VALUES(8, 8, '2#', '卫生巾', '2022-11-11 11:34:09', NULL, 500);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 读取2线数据
|
|
|
|
|
/// </summary>
|
|
|
|
|
[HttpGet]
|
|
|
|
|
public async Task<string> TestRead2()
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
//IP 183.129.248.194
|
|
|
|
|
EquipInput input1 = new()
|
|
|
|
|
{
|
|
|
|
|
eqmt_id = 8,
|
|
|
|
|
ip = "183.129.248.194",
|
|
|
|
|
port = new() { 6012}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
await _readPLCDataService.ReadDataLine2(input1);
|
|
|
|
|
|
|
|
|
|
return "OK";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 读取15线数据
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
[HttpGet]
|
|
|
|
|
public async Task<string> TestRead15()
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
//IP 183.129.248.194
|
|
|
|
|
EquipInput input1 = new()
|
|
|
|
|
{
|
|
|
|
|
eqmt_id = 6,
|
|
|
|
|
ip = "183.129.248.194",
|
|
|
|
|
port = new() { 6001 }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
await _readPLCDataService.ReadDataLine15(input1);
|
|
|
|
|
|
|
|
|
|
return "OK";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 读取7线数据
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <returns></returns>
|
|
|
|
|
[HttpGet]
|
|
|
|
|
public async Task<string> TestRead7()
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
//IP 183.129.248.194
|
|
|
|
|
EquipInput input1 = new()
|
|
|
|
|
{
|
|
|
|
|
eqmt_id = 7,
|
|
|
|
|
ip = "183.129.248.194",
|
|
|
|
|
port = new() { 6011 }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
await _readPLCDataService.ReadDataLine7(input1);
|
|
|
|
|
|
|
|
|
|
return "OK";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|